clean up

jeffknupp · Feb 6, 2014 · 28f6942 · 28f6942
1 parent 899eab1
commit 28f6942
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/sandman/model/utils.py b/sandman/model/utils.py
@@ -140,11 +140,9 @@ def activate(admin=True, browser=True, name='admin', reflect_all=False):
 
     """
     with app.app_context():
-        generate_pks = current_app.config.get('SANDMAN_GENERATE_PKS', None) or False
-        if getattr(current_app, 'class_references', None) is None:
-            current_app.class_references = {}
-            generate_endpoint_classes(db, generate_pks)
-        elif reflect_all:
+        generate_pks = app.config.get('SANDMAN_GENERATE_PKS', None) or False
+        if getattr(app, 'class_references', None) is None or reflect_all:
+            app.class_references = {}
             generate_endpoint_classes(db, generate_pks)
         else:
             Model.prepare(db.engine)

diff --git a/tests/data/foreign_key b/tests/data/foreign_key
diff --git a/tests/foreign_key_models.py b/tests/foreign_key_models.py
@@ -1,5 +1,4 @@
 """Test that foreign keys with non-trivial keys are properly ignored."""
-from sandman import app
 from sandman.model import activate
 
 activate(admin=False, browser=False, reflect_all=True)
diff --git a/tests/test_foreign_keys.py b/tests/test_foreign_keys.py
@@ -24,7 +24,7 @@ def setup_method(self, _):
                 self.DB_LOCATION)
         app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:////' + self.DB_LOCATION
         app.config['SANDMAN_SHOW_PKS'] = False
-        app.config['SANDMAN_GENERATE_PKS'] = False
+        app.config['SANDMAN_GENERATE_PKS'] = True
         app.config['TESTING'] = True
         self.app = app.test_client()
         # pylint: disable=unused-variable