diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2006-04-14 18:11:54 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2006-04-14 18:11:54 +0000 |
| commit | 56feb8d900c1412b8301a74bee1a3a82b1c2642f (patch) | |
| tree | b875f056b3aef3a4a96900b4530cdbd6e8673c6f /lib/sqlalchemy/sql.py | |
| parent | 4022b1359d30daa7b7fcb0fbc8e7a4e2ac4b0551 (diff) | |
| download | sqlalchemy-56feb8d900c1412b8301a74bee1a3a82b1c2642f.tar.gz | |
had to take out the "treeification" of the dependency sort as it doenst really work , added test conditions to the dependency test + the original test that failed
Diffstat (limited to 'lib/sqlalchemy/sql.py')
| -rw-r--r-- | lib/sqlalchemy/sql.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/sqlalchemy/sql.py b/lib/sqlalchemy/sql.py index 7129781a7..b18b0916e 100644 --- a/lib/sqlalchemy/sql.py +++ b/lib/sqlalchemy/sql.py @@ -917,7 +917,6 @@ class Join(FromClause): def __init__(self, left, right, onclause=None, isouter = False): self.left = left self.right = right - # TODO: if no onclause, do NATURAL JOIN if onclause is None: self.onclause = self._match_primaries(left, right) @@ -925,6 +924,8 @@ class Join(FromClause): self.onclause = onclause self.isouter = isouter + name = property(lambda self: "Join on %s, %s" % (self.left.name, self.right.name)) + def _locate_oid_column(self): return self.left.oid_column |