(no commit message)

diff --git a/lib/sqlalchemy/sql.py b/lib/sqlalchemy/sql.py
index 56e26b5db64023b9459f04ffabba7031b32b18ca..671c59c67d6107c4ae9b25a51653107a420ed90e 100644 (file)
--- 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 f106346976032a8b480010ca7fe37ee9955aad27..6573d7b4e081d68cc62fac0cd45e3e6d860d5150 100644 (file)
--- 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