From: Mike Bayer Date: Tue, 14 Sep 2010 21:46:54 +0000 (-0400) Subject: merge tip X-Git-Tag: rel_0_7b1~252^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d7158a2c3869ad7a1ab07d3a41e831f6806a68c;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git merge tip --- 9d7158a2c3869ad7a1ab07d3a41e831f6806a68c diff --cc lib/sqlalchemy/orm/mapper.py index 3374ea72d2,9e38ac8119..b75583c6e3 --- a/lib/sqlalchemy/orm/mapper.py +++ b/lib/sqlalchemy/orm/mapper.py @@@ -912,12 -914,36 +912,24 @@@ class Mapper(object) if _compile_mappers and not self.compiled: self.compile() - - if not resolve_synonyms: - prop = self._props.get(key, None) - if prop is None and raiseerr: - raise sa_exc.InvalidRequestError( - "Mapper '%s' has no property '%s'" % - (self, key)) - return prop - else: - try: - return getattr(self.class_, key).property - except AttributeError: - if raiseerr: - raise sa_exc.InvalidRequestError( - "Mapper '%s' has no property '%s'" % (self, key)) - else: - return None - + try: + return getattr(self.class_, key).property + except AttributeError: + raise sa_exc.InvalidRequestError( + "Mapper '%s' has no property '%s'" % (self, key)) + + @util.deprecated('0.6.4', + 'Call to deprecated function mapper._get_col_to_pr' + 'op(). Use mapper.get_property_by_column()') + def _get_col_to_prop(self, col): + return self._columntoproperty[col] + + def get_property_by_column(self, column): + """Given a :class:`.Column` object, return the + :class:`.MapperProperty` which maps this column.""" + + return self._columntoproperty[column] + @property def iterate_properties(self): """return an iterator of all MapperProperty objects."""