organizations&organizationtypes
This commit is contained in:
14
database.py
14
database.py
@@ -36,9 +36,14 @@ engine2 = create_engine('sqlite:///'+ path.join(db_path,db_urlfile), convert_un
|
||||
db_session2 = scoped_session(sessionmaker(autocommit=False,
|
||||
autoflush=False,
|
||||
bind=engine2))
|
||||
from database_mbase import MyBase
|
||||
|
||||
Base = declarative_base()
|
||||
|
||||
#Base = declarative_base()
|
||||
#Base.query = db_session.query_property()
|
||||
Base=declarative_base(cls=MyBase)
|
||||
Base.query = db_session.query_property()
|
||||
|
||||
Base2 = declarative_base()
|
||||
Base2.query = db_session2.query_property()
|
||||
|
||||
@@ -48,11 +53,14 @@ def read_json(rq):
|
||||
if js is None:
|
||||
js=rq.form.to_dict()
|
||||
if js=={} and rq.data != "":
|
||||
js=json.loads(rq.data)
|
||||
d=rq.data
|
||||
js=json.loads(d)
|
||||
clogger.info(js)
|
||||
return js
|
||||
|
||||
def init_db():
|
||||
import src.models
|
||||
import src.models
|
||||
from src.models import Organization
|
||||
Base.metadata.create_all(bind=engine)
|
||||
|
||||
def init_db2():
|
||||
|
||||
Reference in New Issue
Block a user