diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2019-01-17 13:16:04 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2019-01-17 13:16:04 -0500 |
| commit | d038f66b2aa31db8fec0883769f6a86bd0353d3b (patch) | |
| tree | 2908b470e55cd00df83f5f629d28c7e3cdeb7b65 /lib/sqlalchemy/dialects/mssql | |
| parent | 0717ce9d1dc28b67b4568351f4e98e59a831b1f1 (diff) | |
| download | sqlalchemy-d038f66b2aa31db8fec0883769f6a86bd0353d3b.tar.gz | |
Repair use of deprecated text() typemap, bindparams parameters
These will emit a deprecation warning once
If0ea11a1fc24f9a8029352eeadfc49a7a54c0a1b is merged, modernize these
ahead of time as this should likely be backported to 1.2 as well.
Change-Id: Iae4426a856d5617e8a325b14d8b6fc22333f2cda
Diffstat (limited to 'lib/sqlalchemy/dialects/mssql')
| -rw-r--r-- | lib/sqlalchemy/dialects/mssql/base.py | 63 |
1 files changed, 28 insertions, 35 deletions
diff --git a/lib/sqlalchemy/dialects/mssql/base.py b/lib/sqlalchemy/dialects/mssql/base.py index 32e3372c0..d0f02bb23 100644 --- a/lib/sqlalchemy/dialects/mssql/base.py +++ b/lib/sqlalchemy/dialects/mssql/base.py @@ -2374,19 +2374,17 @@ class MSDialect(default.DefaultDialect): "join sys.schemas as sch on sch.schema_id=tab.schema_id " "where tab.name = :tabname " "and sch.name=:schname " - "and ind.is_primary_key=0 and ind.type != 0", - bindparams=[ - sql.bindparam( - "tabname", - tablename, - sqltypes.String(convert_unicode=True), - ), - sql.bindparam( - "schname", owner, sqltypes.String(convert_unicode=True) - ), - ], - typemap={"name": sqltypes.Unicode()}, + "and ind.is_primary_key=0 and ind.type != 0" ) + .bindparams( + sql.bindparam( + "tabname", tablename, sqltypes.String(convert_unicode=True) + ), + sql.bindparam( + "schname", owner, sqltypes.String(convert_unicode=True) + ), + ) + .columns(name=sqltypes.Unicode()) ) indexes = {} for row in rp: @@ -2405,19 +2403,17 @@ class MSDialect(default.DefaultDialect): "ind_col.object_id=tab.object_id) " "join sys.schemas as sch on sch.schema_id=tab.schema_id " "where tab.name=:tabname " - "and sch.name=:schname", - bindparams=[ - sql.bindparam( - "tabname", - tablename, - sqltypes.String(convert_unicode=True), - ), - sql.bindparam( - "schname", owner, sqltypes.String(convert_unicode=True) - ), - ], - typemap={"name": sqltypes.Unicode()}, + "and sch.name=:schname" ) + .bindparams( + sql.bindparam( + "tabname", tablename, sqltypes.String(convert_unicode=True) + ), + sql.bindparam( + "schname", owner, sqltypes.String(convert_unicode=True) + ), + ) + .columns(name=sqltypes.Unicode()) ) for row in rp: if row["index_id"] in indexes: @@ -2438,17 +2434,14 @@ class MSDialect(default.DefaultDialect): " where " "mod.object_id=views.object_id and " "views.schema_id=sch.schema_id and " - "views.name=:viewname and sch.name=:schname", - bindparams=[ - sql.bindparam( - "viewname", - viewname, - sqltypes.String(convert_unicode=True), - ), - sql.bindparam( - "schname", owner, sqltypes.String(convert_unicode=True) - ), - ], + "views.name=:viewname and sch.name=:schname" + ).bindparams( + sql.bindparam( + "viewname", viewname, sqltypes.String(convert_unicode=True) + ), + sql.bindparam( + "schname", owner, sqltypes.String(convert_unicode=True) + ), ) ) |