From 28f69426ef5a7f07803a5b73059cd3e15fa7eea6 Mon Sep 17 00:00:00 2001
From: Jeff Knupp <jknupp@appnexus.com>
Date: Thu, 6 Feb 2014 17:11:42 -0500
Subject: [PATCH] clean up

---
 sandman/model/utils.py      |   8 +++-----
 tests/data/foreign_key      | Bin 28672 -> 32768 bytes
 tests/foreign_key_models.py |   1 -
 tests/test_foreign_keys.py  |   2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/sandman/model/utils.py b/sandman/model/utils.py
index f78600c..59fe14c 100644
--- 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
index deeff9cb11e95ba29bca85e8acd14f5619f74bad..c38f3ecbdd8a7ce0edd1fba0f839b19822a34b5c 100644
GIT binary patch
delta 170
zcmZp8z}V2hG(lRBhk=2C1BhXOWulI;G!KLBBNbl$KMd?#sth~^{D-+&xW981a9!k5
z-PpLA)7z7sO<YuzvAiTPDJQigwYUU?Ih=!B9Yb6dLL8lZTou$oLh1?{T<V!A>I#{8
zB|2Q{d5O8H>I!9vMadb7MG6{*2AW)&n+v!mq;l~Bt!L!_!NC7xv!KFjer_O_jggsC
II4wUP02^H?Q2+n{

delta 65
zcmZo@U}|{4I6+#Fi-CcG9f)Cod7_T7Bo~A3BUN7hKMZVK1q?g}{D-+&xW981a9!Li
NDDZ=Ga{<?cQ~-(64t@Xt

diff --git a/tests/foreign_key_models.py b/tests/foreign_key_models.py
index d9206c8..a46a56b 100644
--- 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
index 448984f..005cda6 100644
--- 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