diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-03-19 17:37:43 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-03-19 17:37:43 -0400 |
| commit | b31a17c521ec1160a653774e2a4b99b01d27a644 (patch) | |
| tree | cb0e5fbca3dbe0fb319c163f83c30d0dd118c108 /lib/sqlalchemy/dialects/mssql | |
| parent | 0f55ef3beadc6d149fcc2273cb16531fc0a02251 (diff) | |
| download | sqlalchemy-b31a17c521ec1160a653774e2a4b99b01d27a644.tar.gz | |
removed all dialect table_names() methods and standardized
on get_table_names(). [ticket:1739]
Diffstat (limited to 'lib/sqlalchemy/dialects/mssql')
| -rw-r--r-- | lib/sqlalchemy/dialects/mssql/base.py | 13 | ||||
| -rw-r--r-- | lib/sqlalchemy/dialects/mssql/information_schema.py | 4 |
2 files changed, 6 insertions, 11 deletions
diff --git a/lib/sqlalchemy/dialects/mssql/base.py b/lib/sqlalchemy/dialects/mssql/base.py index 7660fe9f7..57b468083 100644 --- a/lib/sqlalchemy/dialects/mssql/base.py +++ b/lib/sqlalchemy/dialects/mssql/base.py @@ -1149,11 +1149,6 @@ class MSDialect(default.DefaultDialect): pass return self.schema_name - def table_names(self, connection, schema): - s = select([ischema.tables.c.table_name], - ischema.tables.c.table_schema==schema) - return [row[0] for row in connection.execute(s)] - def has_table(self, connection, tablename, schema=None): current_schema = schema or self.default_schema_name @@ -1182,7 +1177,7 @@ class MSDialect(default.DefaultDialect): s = sql.select([tables.c.table_name], sql.and_( tables.c.table_schema == current_schema, - tables.c.table_type == 'BASE TABLE' + tables.c.table_type == u'BASE TABLE' ), order_by=[tables.c.table_name] ) @@ -1196,7 +1191,7 @@ class MSDialect(default.DefaultDialect): s = sql.select([tables.c.table_name], sql.and_( tables.c.table_schema == current_schema, - tables.c.table_type == 'VIEW' + tables.c.table_type == u'VIEW' ), order_by=[tables.c.table_name] ) @@ -1320,11 +1315,11 @@ class MSDialect(default.DefaultDialect): table_fullname = "%s.%s" % (current_schema, tablename) cursor = connection.execute( "select ident_seed('%s'), ident_incr('%s')" - % (tablename, tablename) + % (table_fullname, table_fullname) ) row = cursor.first() - if not row is None: + if row is not None and row[0] is not None: colmap[ic]['sequence'].update({ 'start' : int(row[0]), 'increment' : int(row[1]) diff --git a/lib/sqlalchemy/dialects/mssql/information_schema.py b/lib/sqlalchemy/dialects/mssql/information_schema.py index bb6ff315a..312e83cb1 100644 --- a/lib/sqlalchemy/dialects/mssql/information_schema.py +++ b/lib/sqlalchemy/dialects/mssql/information_schema.py @@ -21,7 +21,7 @@ tables = Table("TABLES", ischema, Column("TABLE_CATALOG", CoerceUnicode, key="table_catalog"), Column("TABLE_SCHEMA", CoerceUnicode, key="table_schema"), Column("TABLE_NAME", CoerceUnicode, key="table_name"), - Column("TABLE_TYPE", String, key="table_type"), + Column("TABLE_TYPE", String(convert_unicode=True), key="table_type"), schema="INFORMATION_SCHEMA") columns = Table("COLUMNS", ischema, @@ -42,7 +42,7 @@ constraints = Table("TABLE_CONSTRAINTS", ischema, Column("TABLE_SCHEMA", CoerceUnicode, key="table_schema"), Column("TABLE_NAME", CoerceUnicode, key="table_name"), Column("CONSTRAINT_NAME", CoerceUnicode, key="constraint_name"), - Column("CONSTRAINT_TYPE", String, key="constraint_type"), + Column("CONSTRAINT_TYPE", String(convert_unicode=True), key="constraint_type"), schema="INFORMATION_SCHEMA") column_constraints = Table("CONSTRAINT_COLUMN_USAGE", ischema, |