- an unfortunate naming conflict

- needed sql import on and()

diff --git a/lib/sqlalchemy/exceptions.py b/lib/sqlalchemy/exceptions.py
index 747a519f655ffdba6d38806cdca70cd16520a243..43623df93fa0ce1efb4c239c19c059ef8c3c9802 100644 (file)
--- a/lib/sqlalchemy/exceptions.py
+++ b/lib/sqlalchemy/exceptions.py
@@ -65,7 +65,7 @@ class AssertionError(SQLAlchemyError):
 class NoSuchColumnError(KeyError, SQLAlchemyError):
     """Raised by ``RowProxy`` when a nonexistent column is requested from a row."""
     
-class NoSuchTableError(InvalidRequestError):
+class NoReferencedTableError(InvalidRequestError):
     """Raised by ``ForeignKey`` when the referred ``Table`` cannot be located."""
 
 class DisconnectionError(SQLAlchemyError):

diff --git a/lib/sqlalchemy/schema.py b/lib/sqlalchemy/schema.py
index 5ca9573adb3319416b0a853297d1142ff64e2a1b..66d1a17366df6a0b5982270e96596acfee702921 100644 (file)
--- a/lib/sqlalchemy/schema.py
+++ b/lib/sqlalchemy/schema.py
@@ -782,7 +782,7 @@ class ForeignKey(SchemaItem):
                 else:
                     (schema,tname,colname) = m.group(1,2,3)
                 if _get_table_key(tname, schema) not in parenttable.metadata:
-                    raise exceptions.NoSuchTableError(
+                    raise exceptions.NoReferencedTableError(
                         "Could not find table '%s' with which to generate a "
                         "foreign key" % tname)
                 table = Table(tname, parenttable.metadata,

diff --git a/lib/sqlalchemy/sql/util.py b/lib/sqlalchemy/sql/util.py
index 0c85cbe4a8d4363eb89492a2e34c3d3ba7d21943..d299982cfa0e24fbc60cf9bc16c4e8b7c2d78596 100644 (file)
--- a/lib/sqlalchemy/sql/util.py
+++ b/lib/sqlalchemy/sql/util.py
@@ -72,7 +72,7 @@ def join_condition(a, b, ignore_nonexistent_tables=False):
     for fk in b.foreign_keys:
         try:
             col = fk.get_referent(a)
-        except exceptions.NoSuchTableError:
+        except exceptions.NoReferencedTableError:
             if ignore_nonexistent_tables:
                 continue
             else:
@@ -86,7 +86,7 @@ def join_condition(a, b, ignore_nonexistent_tables=False):
         for fk in a.foreign_keys:
             try:
                 col = fk.get_referent(b)
-            except exceptions.NoSuchTableError:
+            except exceptions.NoReferencedTableError:
                 if ignore_nonexistent_tables:
                     continue
                 else:
@@ -110,7 +110,7 @@ def join_condition(a, b, ignore_nonexistent_tables=False):
     elif len(crit) == 1:
         return (crit[0])
     else:
-        return and_(*crit)
+        return sql.and_(*crit)
     
     
 def reduce_columns(columns, *clauses):

diff --git a/test/sql/selectable.py b/test/sql/selectable.py
index 20788fedc8faea168b82f84238bfd794eb724d6b..d3b639767477bf83c6a35117338f421d39bab9ea 100755 (executable)
--- a/test/sql/selectable.py
+++ b/test/sql/selectable.py
@@ -233,7 +233,7 @@ class SelectableTest(TestBase, AssertsExecutionResults):
 
         s = select([t2, t3], use_labels=True)
 
-        self.assertRaises(exceptions.NoSuchTableError, s.join, t1)
+        self.assertRaises(exceptions.NoReferencedTableError, s.join, t1)
         
 class PrimaryKeyTest(TestBase, AssertsExecutionResults):
     def test_join_pk_collapse_implicit(self):