diff options
| -rw-r--r-- | lib/sqlalchemy/sql.py | 4 | ||||
| -rw-r--r-- | test/tables.py | 9 |
2 files changed, 12 insertions, 1 deletions
diff --git a/lib/sqlalchemy/sql.py b/lib/sqlalchemy/sql.py index 56e26b5db..671c59c67 100644 --- a/lib/sqlalchemy/sql.py +++ b/lib/sqlalchemy/sql.py @@ -20,6 +20,7 @@ import sqlalchemy.schema as schema import sqlalchemy.util as util +import sqlalchemy.types as types import string __ALL__ = ['textclause', 'select', 'join', 'and_', 'or_', 'union', 'desc', 'asc', 'outerjoin', 'alias', 'subquery', 'bindparam', 'sequence'] @@ -249,7 +250,8 @@ class ColumnClause(ClauseElement): self.text = text self.table = selectable self._impl = ColumnSelectable(self) - + self.type = types.NullTypeEngine() + columns = property(lambda self: [self]) name = property(lambda self:self.text) key = property(lambda self:self.text) diff --git a/test/tables.py b/test/tables.py index f10634697..6573d7b4e 100644 --- a/test/tables.py +++ b/test/tables.py @@ -3,6 +3,12 @@ from sqlalchemy.sql import * from sqlalchemy.schema import * from sqlalchemy.mapper import * import os +import testbase + +__ALL__ = ['db', 'users', 'addresses', 'orders', 'orderitems', 'keywords', 'itemkeywords'] + +ECHO = testbase.echo +DATA = True DBTYPE = 'sqlite_memory' @@ -150,3 +156,6 @@ class Keyword(object): def __repr__(self): return "Keyword: %s/%s" % (repr(getattr(self, 'keyword_id', None)),repr(self.name)) + + +#db.echo = True |