diff options
Diffstat (limited to 'lib/sqlalchemy/dialects')
| -rw-r--r-- | lib/sqlalchemy/dialects/mssql/base.py | 10 | ||||
| -rw-r--r-- | lib/sqlalchemy/dialects/oracle/base.py | 16 |
2 files changed, 10 insertions, 16 deletions
diff --git a/lib/sqlalchemy/dialects/mssql/base.py b/lib/sqlalchemy/dialects/mssql/base.py index 05c34c171..3345d555f 100644 --- a/lib/sqlalchemy/dialects/mssql/base.py +++ b/lib/sqlalchemy/dialects/mssql/base.py @@ -1704,12 +1704,14 @@ class MSSQLCompiler(compiler.SQLCompiler): self.process(element.typeclause, **kw), ) - def visit_select(self, select, **kwargs): + def translate_select_structure(self, select_stmt, **kwargs): """Look for ``LIMIT`` and OFFSET in a select statement, and if so tries to wrap it in a subquery with ``row_number()`` criterion. MSSQL 2012 and above are excluded """ + select = select_stmt + if ( not self.dialect._supports_offset_fetch and ( @@ -1741,7 +1743,7 @@ class MSSQLCompiler(compiler.SQLCompiler): limit_clause = select._limit_clause offset_clause = select._offset_clause - kwargs["select_wraps_for"] = select + select = select._generate() select._mssql_visit = True select = ( @@ -1766,9 +1768,9 @@ class MSSQLCompiler(compiler.SQLCompiler): ) else: limitselect = limitselect.where(mssql_rn <= (limit_clause)) - return self.process(limitselect, **kwargs) + return limitselect else: - return compiler.SQLCompiler.visit_select(self, select, **kwargs) + return select @_with_legacy_schema_aliasing def visit_table(self, table, mssql_aliased=False, iscrud=False, **kwargs): diff --git a/lib/sqlalchemy/dialects/oracle/base.py b/lib/sqlalchemy/dialects/oracle/base.py index dd7d6a4d1..481ea7263 100644 --- a/lib/sqlalchemy/dialects/oracle/base.py +++ b/lib/sqlalchemy/dialects/oracle/base.py @@ -975,16 +975,8 @@ class OracleCompiler(compiler.SQLCompiler): return "RETURNING " + ", ".join(columns) + " INTO " + ", ".join(binds) - def _TODO_visit_compound_select(self, select): - """Need to determine how to get ``LIMIT``/``OFFSET`` into a - ``UNION`` for Oracle. - """ - pass - - def visit_select(self, select, **kwargs): - """Look for ``LIMIT`` and OFFSET in a select statement, and if - so tries to wrap it in a subquery with ``rownum`` criterion. - """ + def translate_select_structure(self, select_stmt, **kwargs): + select = select_stmt if not getattr(select, "_oracle_visit", None): if not self.dialect.use_ansi: @@ -1003,7 +995,7 @@ class OracleCompiler(compiler.SQLCompiler): # https://blogs.oracle.com/oraclemagazine/\ # on-rownum-and-limiting-results - kwargs["select_wraps_for"] = orig_select = select + orig_select = select select = select._generate() select._oracle_visit = True @@ -1136,7 +1128,7 @@ class OracleCompiler(compiler.SQLCompiler): offsetselect._for_update_arg = for_update select = offsetselect - return compiler.SQLCompiler.visit_select(self, select, **kwargs) + return select def limit_clause(self, select, **kw): return "" |
