summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBert JW Regeer <xistence@0x58.com>2015-11-07 13:08:59 -0700
committerBert JW Regeer <xistence@0x58.com>2015-11-07 13:08:59 -0700
commitb668bfce29552ebbd243111e82992d5de40a8272 (patch)
tree18861556b6063d65503040028907f67849af4a0e
parent0a960a39461ff5f426159153f91a43b6aa5bde74 (diff)
parent708341cc3e8dc914220d164d489f0cd8152371cd (diff)
downloadpyramid-b668bfce29552ebbd243111e82992d5de40a8272.tar.gz
pyramid-b668bfce29552ebbd243111e82992d5de40a8272.tar.bz2
pyramid-b668bfce29552ebbd243111e82992d5de40a8272.zip
Merge pull request #2098 from ergo/feature/alchemy-scaffold-update
add configure_mappers after all our models get imported
-rw-r--r--pyramid/scaffolds/alchemy/+package+/models/__init__.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/pyramid/scaffolds/alchemy/+package+/models/__init__.py b/pyramid/scaffolds/alchemy/+package+/models/__init__.py
index a6fe0d6ee..6ffc10a78 100644
--- a/pyramid/scaffolds/alchemy/+package+/models/__init__.py
+++ b/pyramid/scaffolds/alchemy/+package+/models/__init__.py
@@ -1,3 +1,7 @@
+from sqlalchemy.orm import configure_mappers
# import all models classes here for sqlalchemy mappers
# to pick up
from .mymodel import MyModel # flake8: noqa
+
+# run configure mappers to ensure we avoid any race conditions
+configure_mappers()