oops: committed the rest of [changeset:1759], removed print in sqlite + restored...

diff --git a/lib/sqlalchemy/databases/sqlite.py b/lib/sqlalchemy/databases/sqlite.py
index 529486f46d140cd50e42eb7e754560fb606e1844..192b905617556978c66f4f3e570730e8b2828804 100644 (file)
--- a/lib/sqlalchemy/databases/sqlite.py
+++ b/lib/sqlalchemy/databases/sqlite.py
@@ -212,7 +212,7 @@ class SQLiteDialect(ansisql.ANSIDialect):
                 fk = ([],[])
                 fks[constraint_name] = fk
             
-            print "row! " + repr([key for key in row.keys()]), repr(row)
+            #print "row! " + repr([key for key in row.keys()]), repr(row)
             # look up the table based on the given table's engine, not 'self',
             # since it could be a ProxyEngine
             remotetable = schema.Table(tablename, table.metadata, autoload=True, autoload_with=connection)

diff --git a/lib/sqlalchemy/sql.py b/lib/sqlalchemy/sql.py
index 8ad3ced45bc1c379fbb0d3b01c5b27fc136b6ad2..5d3c7692ad93d3b7cfe82568744dc25738a599fe 100644 (file)
--- a/lib/sqlalchemy/sql.py
+++ b/lib/sqlalchemy/sql.py
@@ -1084,8 +1084,8 @@ class Join(FromClause):
                     self.foreignkey = fk.parent
         if len(crit) == 0:
             raise exceptions.ArgumentError("Cant find any foreign key relationships between '%s' and '%s'" % (primary.name, secondary.name))
-#        elif len(constraints) > 1:
-#            raise exceptions.ArgumentError("Cant determine join between '%s' and '%s'; tables have more than one foreign key constraint relationship between them.  Please specify the 'onclause' of this join explicitly. %s" % (primary.name, secondary.name, constraints))
+        elif len(constraints) > 1:
+            raise exceptions.ArgumentError("Cant determine join between '%s' and '%s'; tables have more than one foreign key constraint relationship between them.  Please specify the 'onclause' of this join explicitly." % (primary.name, secondary.name))
         elif len(crit) == 1:
             return (crit[0])
         else: