lance/edbob
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

clean up edbob.db.init()

Browse source
This commit is contained in:
Lance Edgar 2012-07-26 13:59:41 -07:00
parent dc037faabe
commit 1934ff00e1
1 changed files with 0 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
edbob/db/__init__.py
View file

@ -35,9 +35,6 @@ from sqlalchemy.ext.declarative import declarative_base
import edbob import edbob
# __all__ = ['engines', 'engine', 'Session', 'metadata',
# 'get_setting', 'save_setting']
__all__ = ['engines', 'engine', 'Session', 'get_setting', 'save_setting'] __all__ = ['engines', 'engine', 'Session', 'get_setting', 'save_setting']
inited = False inited = False
@ -45,7 +42,6 @@ engines = None
engine = None engine = None
Session = sessionmaker() Session = sessionmaker()
Base = declarative_base(cls=edbob.Object) Base = declarative_base(cls=edbob.Object)
# metadata = None
def init(config): def init(config):
@ -71,14 +67,10 @@ def init(config):
""" """
import edbob.db import edbob.db
# from edbob.db import classes
from edbob.db import model from edbob.db import model
from edbob.db import enum 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.extensions import extend_framework
# global inited, engines, engine, metadata
global inited, engines, engine global inited, engines, engine
keys = config.get('edbob.db', 'sqlalchemy.keys') keys = config.get('edbob.db', 'sqlalchemy.keys')
@ -103,12 +95,9 @@ def init(config):
if engine: if engine:
Base.metadata.bind = engine Base.metadata.bind = engine
# metadata = get_metadata(bind=engine)
# make_mappers(metadata)
extend_framework() extend_framework()
edbob.graft(edbob, edbob.db) edbob.graft(edbob, edbob.db)
# edbob.graft(edbob, classes)
edbob.graft(edbob, model) edbob.graft(edbob, model)
edbob.graft(edbob, enum) edbob.graft(edbob, enum)
inited = True inited = True