X-Git-Url: http://git.veekun.com/zzz-floof.git/blobdiff_plain/e080215f07b8153ef01d6c840a4ba3a4bfc2d770..f4a6882d2cdb1baeb2c4662b1c305b99d7596cae:/floof/config/environment.py?ds=sidebyside

diff --git a/floof/config/environment.py b/floof/config/environment.py
index 1ee51b8..20683db 100644
--- a/floof/config/environment.py
+++ b/floof/config/environment.py
@@ -8,8 +8,8 @@ from sqlalchemy import engine_from_config
 
 import floof.lib.app_globals as app_globals
 import floof.lib.helpers
+from floof import model
 from floof.config.routing import make_map
-from floof.model import init_model
 
 def load_environment(global_conf, app_conf):
     """Configure the Pylons environment via the ``pylons.config``
@@ -39,7 +39,15 @@ def load_environment(global_conf, app_conf):
 
     # Setup the SQLAlchemy database engine
     engine = engine_from_config(config, 'sqlalchemy.')
-    init_model(engine)
+
+    if model.elixir.options_defaults.get('autoload'):
+        model.elixir.bind = engine
+        model.metadata.bind = engine
+        model.elixir.setup_all()
+    else:
+        model.init_model(engine)
+
+    model.meta.engine = engine
 
     # CONFIGURATION OPTIONS HERE (note: all config options will override
     # any Pylons config options)