diff options
author | Mike Bayer <mike_mp@zzzcomputing.com> | 2006-11-25 21:32:26 +0000 |
---|---|---|
committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2006-11-25 21:32:26 +0000 |
commit | 19fcb943c431c61024ff7548bfff96f0f4d8c67a (patch) | |
tree | ba84267c810efd6bf9eea4a8ee793ab694f4dfcf /lib/sqlalchemy/ansisql.py | |
parent | bf86de347d152a0558c80a6dac545ecf140bdcee (diff) | |
download | sqlalchemy-19fcb943c431c61024ff7548bfff96f0f4d8c67a.tar.gz |
- cleanup on some instance vars in Select (is_scalar, is_subquery, _froms is __froms, removed unused 'nowait', '_text', etc)
- cleaned up __repr__ on Column, AbstractTypeEngine
- added standalone intersect(_all), except(_all) functions, unit tests illustrating nesting patterns [ticket:247]
Diffstat (limited to 'lib/sqlalchemy/ansisql.py')
-rw-r--r-- | lib/sqlalchemy/ansisql.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/ansisql.py b/lib/sqlalchemy/ansisql.py index a0ce64905..2e0fe6e34 100644 --- a/lib/sqlalchemy/ansisql.py +++ b/lib/sqlalchemy/ansisql.py @@ -302,7 +302,7 @@ class ANSICompiler(sql.Compiled): self.select_stack.append(select) for c in select._raw_columns: # TODO: make this polymorphic? - if isinstance(c, sql.Select) and c._scalar: + if isinstance(c, sql.Select) and c.is_scalar: c.accept_visitor(self) inner_columns[self.get_str(c)] = c continue @@ -319,7 +319,7 @@ class ANSICompiler(sql.Compiled): inner_columns[co._label] = l # TODO: figure this out, a ColumnClause with a select as a parent # is different from any other kind of parent - elif select.issubquery and isinstance(co, sql._ColumnClause) and co.table is not None and not isinstance(co.table, sql.Select): + elif select.is_subquery and isinstance(co, sql._ColumnClause) and co.table is not None and not isinstance(co.table, sql.Select): # SQLite doesnt like selecting from a subquery where the column # names look like table.colname, so add a label synonomous with # the column name |