Changeset 186:57220a7d9a3c

Timestamp:

07/17/09 20:13:03 (14 months ago)

Author:

rgrp

Branch:

default

convert_revision:

svn:0ead1229-0713-0410-96cd-f668dbfad531/trunk@272

Message:

[model][s]: refactor to have standard seperate meta.py file + init_model(engine) function called from outside of model/ (in config/environment.py).

Location:

shakespeare

Files:

• cli.py (modified) (1 diff)
• config/environment.py (modified) (2 diffs)
• model/__init__.py (modified) (1 diff)
• model/dm.py (modified) (1 diff)
• model/meta.py (added)
• websetup.py (modified) (1 diff)

shakespeare/cli.py

@@ -87 +87 @@
         import shakespeare
         if line == 'clean':
-            model.metadata.drop_all()
+            model.metadata.drop_all(bind=model.meta.engine)
         elif line == 'create':
-            model.metadata.create_all()
+            model.metadata.create_all(bind=model.meta.engine)
         elif line == 'rebuild':
             model.metadata.drop_all()

shakespeare/config/environment.py

@@ -9 +9 @@
 import shakespeare.lib.helpers
 from shakespeare.config.routing import make_map
+from shakespeare.model import init_model
 
 def load_environment(global_conf, app_conf):
@@ -51 +52 @@
     # CONFIGURATION OPTIONS HERE (note: all config options will override
     # any Pylons config options)
-    config['pylons.g'].sa_engine = engine_from_config(config, 'sqlalchemy.')
+
+    # Setup the SQLAlchemy database engine
+    engine = engine_from_config(config, 'sqlalchemy.')
+    init_model(engine)
+

shakespeare/model/__init__.py

@@ +1 @@
+'''The application's domain model objects'''
+import sqlalchemy
+from sqlalchemy import orm
+
+import meta
 from dm import *
+
+def init_model(engine):
+    '''Call me before using any of the tables or classes in the model'''
+    meta.Session.configure(bind=engine)
+    meta.engine = engine
+

shakespeare/model/dm.py

@@ -2 +2 @@
 Domain model
 """
-from pylons import config
 from sqlalchemy import Column, MetaData, Table, types, ForeignKey
 from sqlalchemy import orm
 from sqlalchemy.orm import relation, backref
 
-# make sure config is registered
-import shakespeare
-shakespeare.conf()
-
-metadata = MetaData(bind=config['pylons.g'].sa_engine)
-Session = orm.scoped_session(orm.sessionmaker(
-    autoflush=True,
-    transactional=False,
-    bind=config['pylons.g'].sa_engine
-))
+from meta import *
 
 import shakespeare

shakespeare/websetup.py

@@ -15 +15 @@
     from shakespeare import model
     log.info('Creating tables')
-    model.metadata.create_all(bind=config['pylons.g'].sa_engine)
+    model.metadata.create_all(bind=model.meta.engine)
     log.info('Creating tables: SUCCESS')