From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 31 Oct 2005 02:37:52 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: rel_0_1_0~408
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=852153d1c702cdbc796e12118457fec78cebda17;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

---

diff --git a/lib/sqlalchemy/databases/postgres.py b/lib/sqlalchemy/databases/postgres.py
index 67ee1d4fd6..3515c5e7af 100644
--- a/lib/sqlalchemy/databases/postgres.py
+++ b/lib/sqlalchemy/databases/postgres.py
@@ -278,7 +278,7 @@ class PGSQLEngine(ansisql.ANSISQLEngine):
                 row[column_constraints.c.table_name],
                 row[column_constraints.c.column_name]
             )
-            print "type %s on column %s to remote %s.%s.%s" % (type, constrained_column, referred_schema, referred_table, referred_column) 
+            #print "type %s on column %s to remote %s.%s.%s" % (type, constrained_column, referred_schema, referred_table, referred_column) 
             if type=='PRIMARY KEY':
                 table.c[constrained_column]._set_primary_key()
             elif type=='FOREIGN KEY':
diff --git a/lib/sqlalchemy/engine.py b/lib/sqlalchemy/engine.py
index 0dc2e267f8..3d8c412210 100644
--- a/lib/sqlalchemy/engine.py
+++ b/lib/sqlalchemy/engine.py
@@ -301,7 +301,7 @@ class ResultProxy:
                 else:
                     rec = (types.NULLTYPE, i)
                 if self.props.setdefault(item[0].lower(), rec) is not rec:
-                    raise "Duplicate column name '%s' in result set! use use_labels on select statement" % (item[0].lower())
+                    raise "Duplicate column name '%s' in result set! try 'use_labels' option on select statement" % (item[0].lower())
                 self.props[i] = rec
                 i+=1
 
diff --git a/test/alltests.py b/test/alltests.py
index cee36d0f0f..e19863e4c6 100644
--- a/test/alltests.py
+++ b/test/alltests.py
@@ -1,13 +1,13 @@
-import unittest
 import testbase
+import unittest
 
 testbase.echo = False
 
 def suite():
-    modules_to_test = ('attributes', 'historyarray', 'pool', 'engines', 'query', 'types', 'mapper', 'objectstore')
+    modules_to_test = ('attributes', 'historyarray', 'pool', 'engines', 'query', 'types', 'mapper', 'objectstore', 'dependency', 'sequence', 'select')
     alltests = unittest.TestSuite()
     for module in map(__import__, modules_to_test):
-        alltests.addTest(unittest.findTestCases(module))
+        alltests.addTest(unittest.findTestCases(module, suiteClass=None))
     return alltests
 
 if __name__ == '__main__':
diff --git a/test/objectstore.py b/test/objectstore.py
index f8aaf497e1..0e56a6ccaf 100644
--- a/test/objectstore.py
+++ b/test/objectstore.py
@@ -279,7 +279,7 @@ class SaveTest(AssertMixin):
                     ]
                 )
         ])
-        l = sql.select([users, addresses], sql.and_(users.c.user_id==addresses.c.address_id, addresses.c.address_id==a.address_id)).execute()
+        l = sql.select([users, addresses], sql.and_(users.c.user_id==addresses.c.address_id, addresses.c.address_id==a.address_id), use_labels=True).execute()
         self.echo( repr(l.fetchone().row))
 
     def testbackwardsnonmatch(self):
diff --git a/test/sequence.py b/test/sequence.py
index 492495f8ea..605c855eaa 100644
--- a/test/sequence.py
+++ b/test/sequence.py
@@ -6,12 +6,13 @@ import testbase
 from sqlalchemy.schema import *
 import sqlalchemy
 
-#db = sqlalchemy.engine.create_engine('postgres', {'database':'test', 'host':'127.0.0.1', 'user':'scott', 'password':'tiger'}, echo=testbase.echo)
-db = sqlalchemy.engine.create_engine('oracle', {'dsn':os.environ['DSN'], 'user':os.environ['USER'], 'password':os.environ['PASSWORD']}, echo=testbase.echo)
 
 class SequenceTest(PersistTest):
 
     def setUp(self):
+        db = sqlalchemy.engine.create_engine('postgres', {'database':'test', 'host':'127.0.0.1', 'user':'scott', 'password':'tiger'}, echo=testbase.echo)
+        #db = sqlalchemy.engine.create_engine('oracle', {'dsn':os.environ['DSN'], 'user':os.environ['USER'], 'password':os.environ['PASSWORD']}, echo=testbase.echo)
+
         self.table = Table("cartitems", db, 
             Column("cart_id", Integer, Sequence('cart_id_seq'), primary_key=True),
             Column("description", String(40)),