diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-06-26 13:24:07 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-06-26 13:24:07 -0400 |
| commit | f76e65727d667a0c40f132698c2c11063d7271bd (patch) | |
| tree | 29652c5f8421e432bab07829f00801b2db627181 /lib/sqlalchemy/dialects | |
| parent | ef6245a3caa10b0d1e1a08e49a91e186a9d9efc6 (diff) | |
| parent | f76cae4bc92da640c155337da5d089075ebae0d8 (diff) | |
| download | sqlalchemy-f76e65727d667a0c40f132698c2c11063d7271bd.tar.gz | |
Merge branch 'ticket_2746'
Conflicts:
doc/build/changelog/changelog_08.rst
doc/build/changelog/changelog_09.rst
Diffstat (limited to 'lib/sqlalchemy/dialects')
| -rw-r--r-- | lib/sqlalchemy/dialects/oracle/base.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/sqlalchemy/dialects/oracle/base.py b/lib/sqlalchemy/dialects/oracle/base.py index a302bf401..272bd1740 100644 --- a/lib/sqlalchemy/dialects/oracle/base.py +++ b/lib/sqlalchemy/dialects/oracle/base.py @@ -553,12 +553,8 @@ class OracleCompiler(compiler.SQLCompiler): if not getattr(select, '_oracle_visit', None): if not self.dialect.use_ansi: - if self.stack and 'from' in self.stack[-1]: - existingfroms = self.stack[-1]['from'] - else: - existingfroms = None - - froms = select._get_display_froms(existingfroms) + froms = self._display_froms_for_select( + select, kwargs.get('asfrom', False)) whereclause = self._get_nonansi_join_whereclause(froms) if whereclause is not None: select = select.where(whereclause) |