diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2008-05-02 01:15:26 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2008-05-02 01:15:26 +0000 |
| commit | 5932e8649d051d2186cd06fb67f3249a11e57638 (patch) | |
| tree | 3d2db3fe6b31ac78355409b03bc340cbcc6fe5d5 /lib/sqlalchemy/sql/util.py | |
| parent | e3460573d037e27592995277a19840be13457828 (diff) | |
| download | sqlalchemy-5932e8649d051d2186cd06fb67f3249a11e57638.tar.gz | |
- an unfortunate naming conflict
- needed sql import on and()
Diffstat (limited to 'lib/sqlalchemy/sql/util.py')
| -rw-r--r-- | lib/sqlalchemy/sql/util.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/sqlalchemy/sql/util.py b/lib/sqlalchemy/sql/util.py index 0c85cbe4a..d299982cf 100644 --- 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): |