(no commit message)

diff --git a/lib/sqlalchemy/ansisql.py b/lib/sqlalchemy/ansisql.py
index a7359acfc7b928573e336e0c7fb9b593e70d363d..d7cce0ce21887d323b3b3b6eaf5a6c84118868d0 100644 (file)
--- a/lib/sqlalchemy/ansisql.py
+++ b/lib/sqlalchemy/ansisql.py
@@ -147,7 +147,10 @@ class ANSICompiler(sql.Compiled):
         for c in select._raw_columns:
             for co in c.columns:
                 inner_columns.append(co)
-                self.typemap[co.label] = co.type
+                if select.use_labels:
+                    self.typemap[co.label] = co.type
+                else:
+                    self.typemap[co.key] = co.type
                 
         if select.use_labels:
             collist = string.join(["%s AS %s" % (c.fullname, c.label) for c in inner_columns], ', ')

diff --git a/test/query.py b/test/query.py
index 47e56ee162758335e1170aa8e8f8a46bfc770ef8..7f452cd2476bdce7e690908801685c7497a7c743 100644 (file)
--- a/test/query.py
+++ b/test/query.py
@@ -1,9 +1,10 @@
 from testbase import PersistTest
+import testbase
 import unittest, sys
 
 import sqlalchemy.databases.sqlite as sqllite
 
-db = sqllite.engine(':memory:', {}, echo = True)
+db = sqllite.engine(':memory:', {}, echo = testbase.echo)
 
 from sqlalchemy.sql import *
 from sqlalchemy.schema import *
@@ -11,7 +12,7 @@ from sqlalchemy.schema import *
 class QueryTest(PersistTest):
     
     def setUp(self):
-        self.users = Table('users', db,
+        self.users = Table('query_users', db,
             Column('user_id', INT, primary_key = True),
             Column('user_name', VARCHAR(20)),
             redefine = True