From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 3 Sep 2005 05:54:40 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: rel_0_1_0~809
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c7e5f0a6c77c2b77a141ad77c7d962669fb8102;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

---

diff --git a/lib/sqlalchemy/sql.py b/lib/sqlalchemy/sql.py
index b2bb32656c..f2617d2a2b 100644
--- a/lib/sqlalchemy/sql.py
+++ b/lib/sqlalchemy/sql.py
@@ -408,6 +408,8 @@ class Join(Selectable):
         self.onclause = onclause
         self.isouter = isouter
 
+    primary_keys = property (lambda self: [c for c in self.left.columns if c.primary_key] + [c for c in self.right.columns if c.primary_key])
+
     def hash_key(self):
         return "Join(%s, %s, %s, %s)" % (repr(self.left.hash_key()), repr(self.right.hash_key()), repr(self.onclause.hash_key()), repr(self.isouter))