From 3c4219f22ec34eac3e3b5f84e1d8b000983e244d Mon Sep 17 00:00:00 2001 From: Ant Zucaro Date: Thu, 31 Mar 2011 17:16:30 -0400 Subject: [PATCH] Add engine setup and database structure creation function. --- xonstat/__init__.py | 10 +++++++++- xonstat/models.py | 3 ++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/xonstat/__init__.py b/xonstat/__init__.py index 9b80fe0..296c0e4 100644 --- a/xonstat/__init__.py +++ b/xonstat/__init__.py @@ -1,13 +1,21 @@ +import sqlahelper from pyramid.config import Configurator from sqlalchemy import engine_from_config -from xonstat.models import initialize_sql def main(global_config, **settings): """ This function returns a Pyramid WSGI application. """ + # setup the database engine engine = engine_from_config(settings, 'sqlalchemy.') + sqlahelper.add_engine(engine) + + # create the database structures + # note: have to import here else we'll get` + # "no engine 'default' was configured + from xonstat.models import initialize_sql initialize_sql(engine) + config = Configurator(settings=settings) config.add_static_view('static', 'xonstat:static') return config.make_wsgi_app() diff --git a/xonstat/models.py b/xonstat/models.py index 57f3202..ec3d896 100644 --- a/xonstat/models.py +++ b/xonstat/models.py @@ -1,3 +1,4 @@ +import sqlahelper import transaction from sqlalchemy import Column @@ -10,7 +11,7 @@ from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.orm import scoped_session from sqlalchemy.orm import sessionmaker - +Engine=sqlahelper.get_engine() DBSession = scoped_session(sessionmaker()) Base = declarative_base() -- 2.39.2