Make column inspection optional

meyt · Oct 23, 2017 · 4337530 · 4337530
1 parent 6556e53
commit 4337530
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 13 deletions.
diff --git a/sqlalchemy_dict/base_model.py b/sqlalchemy_dict/base_model.py
@@ -76,22 +76,28 @@ def update_from_dict(self, context):
             )
 
     @classmethod
-    def iter_columns(cls, relationships=True, synonyms=True, composites=True, hybrids=True):
-        mapper = inspect(cls)
-        for k, c in mapper.all_orm_descriptors.items():
+    def iter_columns(cls, relationships=True, synonyms=True, composites=True, use_inspection=True, hybrids=True):
+        if use_inspection:
+            mapper = inspect(cls)
+            for k, c in mapper.all_orm_descriptors.items():
 
-            if k == '__mapper__':
-                continue
+                if k == '__mapper__':
+                    continue
 
-            if c.extension_type == ASSOCIATION_PROXY:
-                continue
+                if c.extension_type == ASSOCIATION_PROXY:
+                    continue
 
-            if (not hybrids and c.extension_type == HYBRID_PROPERTY) \
-                    or (not relationships and k in mapper.relationships) \
-                    or (not synonyms and k in mapper.synonyms) \
-                    or (not composites and k in mapper.composites):
-                continue
-            yield getattr(cls, k)
+                if (not hybrids and c.extension_type == HYBRID_PROPERTY) \
+                        or (not relationships and k in mapper.relationships) \
+                        or (not synonyms and k in mapper.synonyms) \
+                        or (not composites and k in mapper.composites):
+                    continue
+                yield getattr(cls, k)
+
+        else:
+            # noinspection PyUnresolvedReferences
+            for c in cls.__table__.c:
+                yield c
 
     @classmethod
     def iter_dict_columns(cls, include_readonly_columns=True, include_protected_columns=False, **kw):

diff --git a/sqlalchemy_dict/tests/test_base_model.py b/sqlalchemy_dict/tests/test_base_model.py
@@ -201,6 +201,17 @@ def test_iter_columns(self):
         self.assertNotIn('password', columns)
         self.assertIn('_password', columns)
 
+        columns = {c.key: c for c in Member.iter_columns(
+            relationships=False,
+            synonyms=False,
+            composites=False,
+            use_inspection=False
+        )}
+        self.assertEqual(len(columns), 16)
+        self.assertNotIn('is_visible', columns)
+        self.assertNotIn('_password', columns)
+        self.assertIn('password', columns)
+
     def test_iter_dict_columns(self):
         columns = {c.key: c for c in Member.iter_dict_columns(
             include_readonly_columns=False, include_protected_columns=False)}