- omitted 'table' and 'column' from 'from sqlalchemy import *'

- also omitted all modules and classes that aren't expicitly public
- omitted 'Smallinteger' (small i), but it's still in schema
- omitted NullType-related items from types.__all__
- patched up a few tests to use sql.table and sql.column, other related.

1 files changed, 2 insertions, 2 deletions

diff --git a/test/sql/query.py b/test/sql/query.py
index ddd5348c4..4e68fb980 100644
--- a/test/sql/query.py
+++ b/test/sql/query.py
@@ -1,7 +1,7 @@
 import testbase
 import datetime
 from sqlalchemy import *
-from sqlalchemy import exceptions
+from sqlalchemy import exceptions, sql
 from sqlalchemy.engine import default
 from testlib import *
 
@@ -397,7 +397,7 @@ class QueryTest(PersistTest):
         w = select(['*'], from_obj=[testbase.db.func.current_date()]).scalar()
         
         # construct a column-based FROM object out of a function, like in [ticket:172]
-        s = select([column('date', type_=DateTime)], from_obj=[testbase.db.func.current_date()])
+        s = select([sql.column('date', type_=DateTime)], from_obj=[testbase.db.func.current_date()])
         q = s.execute().fetchone()[s.c.date]
         r = s.alias('datequery').select().scalar()