From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Tue, 19 Aug 2014 22:17:25 +0000 (-0400)
Subject: Merge branch 'master' into ticket_3100
X-Git-Tag: rel_1_0_0b1~212
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf14823e41c5e74b38d0bb7768139d04d47dfc4d;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Merge branch 'master' into ticket_3100
---

cf14823e41c5e74b38d0bb7768139d04d47dfc4d
diff --cc lib/sqlalchemy/orm/mapper.py
index b98fbda420,f22cac329c..63d23e31d1
--- a/lib/sqlalchemy/orm/mapper.py
+++ b/lib/sqlalchemy/orm/mapper.py
@@@ -2364,12 -2364,11 +2364,15 @@@ class Mapper(InspectionAttr)
  
      @_memoized_configured_property
      def _primary_key_props(self):
+         # TODO: this should really be called "identity key props",
+         # as it does not necessarily include primary key columns within
+         # individual tables
          return [self._columntoproperty[col] for col in self.primary_key]
  
 +    @_memoized_configured_property
 +    def _primary_key_propkeys(self):
 +        return set([prop.key for prop in self._primary_key_props])
 +
      def _get_state_attr_by_column(
              self, state, dict_, column,
              passive=attributes.PASSIVE_RETURN_NEVER_SET):