From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Thu, 3 Aug 2006 00:33:00 +0000 (+0000)
Subject: oops:  committed the rest of [changeset:1759], removed print in sqlite + restored... 
X-Git-Tag: rel_0_2_7~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ca2c769cdf77ff8f1fdcf9ad7e606676fcffee3;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

oops:  committed the rest of [changeset:1759], removed print in sqlite + restored error check in Join
---

diff --git a/lib/sqlalchemy/databases/sqlite.py b/lib/sqlalchemy/databases/sqlite.py
index 529486f46d..192b905617 100644
--- 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 8ad3ced45b..5d3c7692ad 100644
--- 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: