From ddbcf97f3343f9ccad1a04b258086b7f55577c43 Mon Sep 17 00:00:00 2001 From: Philip Jenvey Date: Thu, 1 Oct 2009 21:27:12 +0000 Subject: [PATCH] avoid __nonzero__ on ClauseElements --- lib/sqlalchemy/dialects/mssql/base.py | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/lib/sqlalchemy/dialects/mssql/base.py b/lib/sqlalchemy/dialects/mssql/base.py index b190af7b20..9964a28436 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: -- 2.47.2