diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2020-02-17 21:09:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@bbpush.zzzcomputing.com> | 2020-02-17 21:09:22 +0000 |
| commit | feb0c6765cd299a809a35b6b6d719bec077dc456 (patch) | |
| tree | 0c7f78b1a6e1c2a1b26a110da2b88c4df92b486c /lib/sqlalchemy/dialects | |
| parent | 236db97fc419722d51236097d9bba1e645c4c7db (diff) | |
| parent | 9fca5d827d880ccc529c94bb65c46de6aafd227c (diff) | |
| download | sqlalchemy-feb0c6765cd299a809a35b6b6d719bec077dc456.tar.gz | |
Merge "Create initial future package, RemovedIn20Warning"
Diffstat (limited to 'lib/sqlalchemy/dialects')
| -rw-r--r-- | lib/sqlalchemy/dialects/mssql/base.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/dialects/oracle/base.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/sqlalchemy/dialects/mssql/base.py b/lib/sqlalchemy/dialects/mssql/base.py index f900441a2..1b1bd8c5c 100644 --- a/lib/sqlalchemy/dialects/mssql/base.py +++ b/lib/sqlalchemy/dialects/mssql/base.py @@ -1728,7 +1728,7 @@ class MSSQLCompiler(compiler.SQLCompiler): select = select._generate() select._mssql_visit = True select = ( - select.column( + select.add_columns( sql.func.ROW_NUMBER() .over(order_by=_order_by_clauses) .label("mssql_rn") diff --git a/lib/sqlalchemy/dialects/oracle/base.py b/lib/sqlalchemy/dialects/oracle/base.py index 87e0baa58..8c69bf097 100644 --- a/lib/sqlalchemy/dialects/oracle/base.py +++ b/lib/sqlalchemy/dialects/oracle/base.py @@ -986,7 +986,7 @@ class OracleCompiler(compiler.SQLCompiler): for elem in for_update.of: if not select.selected_columns.contains_column(elem): - select = select.column(elem) + select = select.add_columns(elem) # Wrap the middle select and add the hint inner_subquery = select.alias() @@ -1056,7 +1056,7 @@ class OracleCompiler(compiler.SQLCompiler): limitselect._for_update_arg = for_update select = limitselect else: - limitselect = limitselect.column( + limitselect = limitselect.add_columns( sql.literal_column("ROWNUM").label("ora_rn") ) limitselect._oracle_visit = True @@ -1069,7 +1069,7 @@ class OracleCompiler(compiler.SQLCompiler): limitselect_cols.corresponding_column(elem) is None ): - limitselect = limitselect.column(elem) + limitselect = limitselect.add_columns(elem) limit_subquery = limitselect.alias() origselect_cols = orig_select.selected_columns |