From f8ebf35deb4864826b6bc1789223e2a42e6edf96 Mon Sep 17 00:00:00 2001 From: Jason Kirtland Date: Wed, 1 Aug 2007 15:33:55 +0000 Subject: [PATCH] Make {include,exclude}_properties membership tests ignore column_prefix --- lib/sqlalchemy/orm/mapper.py | 8 ++++---- test/orm/mapper.py | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py index 3560a1c59a..debce60f29 100644 --- a/lib/sqlalchemy/orm/mapper.py +++ b/lib/sqlalchemy/orm/mapper.py @@ -585,13 +585,13 @@ class Mapper(object): if prop is None: if (self.include_properties is not None and - column_key not in self.include_properties): - self.__log("not including property %s" % (column_key)) + column.key not in self.include_properties): + self.__log("not including property %s" % (column.key)) continue if (self.exclude_properties is not None and - column_key in self.exclude_properties): - self.__log("excluding property %s" % (column_key)) + column.key in self.exclude_properties): + self.__log("excluding property %s" % (column.key)) continue prop = ColumnProperty(column) diff --git a/test/orm/mapper.py b/test/orm/mapper.py index 58f0f8411d..f224cfc11b 100644 --- a/test/orm/mapper.py +++ b/test/orm/mapper.py @@ -272,10 +272,10 @@ class MapperTest(MapperSuperTest): v_m = mapper(Vendor, inherits=p_m, polymorphic_identity='vendor', exclude_properties=('boss_id', 'employee_number')) h_m = mapper(Hoho, t, include_properties=('id', 'type', 'name')) - l_m = mapper(Lala, t, exclude_properties=('vendor_id', 'boss_id')) + l_m = mapper(Lala, t, exclude_properties=('vendor_id', 'boss_id'), + column_prefix="p_") - for m in p_m, e_m, m_m, v_m, h_m, l_m: - m.compile() + p_m.compile() def assert_props(cls, want): have = set([n for n in dir(cls) if not n.startswith('_')]) @@ -290,7 +290,7 @@ class MapperTest(MapperSuperTest): 'id', 'name', 'type']) assert_props(Vendor, ['vendor_id', 'id', 'name', 'type']) assert_props(Hoho, ['id', 'name', 'type']) - assert_props(Lala, ['employee_number', 'id', 'name', 'type']) + assert_props(Lala, ['p_employee_number', 'p_id', 'p_name', 'p_type']) def testrecursiveselectby(self): """test that no endless loop occurs when traversing for select_by""" -- 2.47.3