diff options
| author | Philip Jenvey <pjenvey@underboss.org> | 2009-10-01 21:27:12 +0000 |
|---|---|---|
| committer | Philip Jenvey <pjenvey@underboss.org> | 2009-10-01 21:27:12 +0000 |
| commit | ddbcf97f3343f9ccad1a04b258086b7f55577c43 (patch) | |
| tree | 7f3ed408e8eee77cdf612d52ea08ca9e4d16f450 /lib/sqlalchemy | |
| parent | 0d8ba830467f065b5778f4b119dbd3a3c276a845 (diff) | |
| download | sqlalchemy-ddbcf97f3343f9ccad1a04b258086b7f55577c43.tar.gz | |
avoid __nonzero__ on ClauseElements
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/dialects/mssql/base.py | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/lib/sqlalchemy/dialects/mssql/base.py b/lib/sqlalchemy/dialects/mssql/base.py index b190af7b2..9964a2843 100644 --- a/lib/sqlalchemy/dialects/mssql/base.py +++ b/lib/sqlalchemy/dialects/mssql/base.py @@ -1193,12 +1193,12 @@ class MSDialect(default.DefaultDialect): def has_table(self, connection, tablename, schema=None): current_schema = schema or self.default_schema_name columns = ischema.columns - s = sql.select([columns], - current_schema - and sql.and_(columns.c.table_name==tablename, columns.c.table_schema==current_schema) - or columns.c.table_name==tablename, - ) - + if current_schema: + whereclause = sql.and_(columns.c.table_name==tablename, + columns.c.table_schema==current_schema) + else: + whereclause = columns.c.table_name==tablename + s = sql.select([columns], whereclause) c = connection.execute(s) return c.first() is not None @@ -1278,11 +1278,12 @@ class MSDialect(default.DefaultDialect): # Get base columns current_schema = schema or self.default_schema_name columns = ischema.columns - s = sql.select([columns], - current_schema - and sql.and_(columns.c.table_name==tablename, columns.c.table_schema==current_schema) - or columns.c.table_name==tablename, - order_by=[columns.c.ordinal_position]) + if current_schema: + whereclause = sql.and_(columns.c.table_name==tablename, + columns.c.table_schema==current_schema) + else: + whereclause = columns.c.table_name==tablename + s = sql.select([columns], whereclause, order_by=[columns.c.ordinal_position]) c = connection.execute(s) cols = [] while True: |