save point (see note)

Added initial alembic skeleton, improved base pyramid templates, added auth db
extension, etc...

edbob/db/__init__.py

@@ -26,20 +26,22 @@
 ``edbob.db`` -- Database Framework
 """
 
-from sqlalchemy import engine_from_config
+from sqlalchemy import engine_from_config, MetaData
 from sqlalchemy.orm import sessionmaker
 
 import edbob
 
 
-__all__ = ['engines', 'engine', 'Session', 'metadata',
-           'get_setting', 'save_setting']
+# __all__ = ['engines', 'engine', 'Session', 'metadata',
+#            'get_setting', 'save_setting']
+
+__all__ = ['engines', 'engine', 'Session', 'get_setting', 'save_setting']
 
 inited = False
 engines = None
 engine = None
 Session = sessionmaker()
-metadata = None
+# metadata = None
 
 
 def init(config):
@@ -65,13 +67,16 @@ def init(config):
     """
 
     import edbob.db
-    from edbob.db import classes
+    # from edbob.db import classes
+    from edbob.db import model
     from edbob.db import enum
-    from edbob.db.model import get_metadata
-    from edbob.db.mappers import make_mappers
-    from edbob.db.extensions import extend_framework
+    from edbob.db.model import Base
+    # from edbob.db.model import get_metadata
+    # from edbob.db.mappers import make_mappers
+    # from edbob.db.extensions import extend_framework
 
-    global inited, engines, engine, metadata
+    # global inited, engines, engine, metadata
+    global inited, engines, engine
 
     keys = config.get('edbob.db', 'sqlalchemy.keys')
     if keys:
@@ -94,13 +99,15 @@ def init(config):
     engine = engines.get('default')
     if engine:
         Session.configure(bind=engine)
+        Base.metadata.bind = engine
     
-    metadata = get_metadata(bind=engine)
-    make_mappers(metadata)
-    extend_framework()
+    # metadata = get_metadata(bind=engine)
+    # make_mappers(metadata)
+    # extend_framework()
 
     edbob.graft(edbob, edbob.db)
-    edbob.graft(edbob, classes)
+    # edbob.graft(edbob, classes)
+    edbob.graft(edbob, model)
     edbob.graft(edbob, enum)
     inited = True
 
@@ -139,19 +146,35 @@ def save_setting(name, value, session=None):
         session.close()
 
 
+def get_core_metadata():
+    """
+    Returns a :class:`sqlalchemy.MetaData` instance containing only those
+    :class:`sqlalchemy.Table`s which are part of the core ``edbob`` schema.
+    """
+
+    from edbob.db import model
+
+    meta = MetaData()
+    for name in model.__all__:
+        if name != 'Base':
+            obj = getattr(model, name)
+            if isinstance(obj, type) and issubclass(obj, model.Base):
+                obj.__table__.tometadata(meta)
+    return meta
+
+
 def needs_session(func):
     """
     Decorator which adds helpful session handling.
     """
 
     def wrapped(*args, **kwargs):
-        session = kwargs.get('session')
-        _session = session
+        session = kwargs.pop('session', None)
+        _orig_session = session
         if not session:
             session = Session()
-        kwargs['session'] = session
         res = func(session, *args, **kwargs)
-        if not _session:
+        if not _orig_session:
             session.commit()
             session.close()
         return res