Move declarative_base Base into base.py
The base class of all models "Base" should be in base.py.
This commit is contained in:
parent
997b419fe3
commit
3c43cfc9f9
@ -15,6 +15,7 @@
|
|||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
|
||||||
|
from sqlalchemy.ext.declarative import declarative_base
|
||||||
from sqlalchemy.orm import scoped_session, sessionmaker, object_session
|
from sqlalchemy.orm import scoped_session, sessionmaker, object_session
|
||||||
from sqlalchemy.orm.query import Query
|
from sqlalchemy.orm.query import Query
|
||||||
from sqlalchemy.sql.expression import desc
|
from sqlalchemy.sql.expression import desc
|
||||||
@ -73,3 +74,6 @@ class GMGTableBase(object):
|
|||||||
sess = Session()
|
sess = Session()
|
||||||
sess.add(self)
|
sess.add(self)
|
||||||
sess.commit()
|
sess.commit()
|
||||||
|
|
||||||
|
|
||||||
|
Base = declarative_base(cls=GMGTableBase)
|
||||||
|
@ -17,7 +17,6 @@
|
|||||||
|
|
||||||
import datetime
|
import datetime
|
||||||
|
|
||||||
from sqlalchemy.ext.declarative import declarative_base
|
|
||||||
from sqlalchemy import (
|
from sqlalchemy import (
|
||||||
Column, Integer, Unicode, UnicodeText, DateTime, Boolean, ForeignKey,
|
Column, Integer, Unicode, UnicodeText, DateTime, Boolean, ForeignKey,
|
||||||
UniqueConstraint)
|
UniqueConstraint)
|
||||||
@ -27,13 +26,10 @@ from sqlalchemy.sql.expression import desc
|
|||||||
from sqlalchemy.ext.associationproxy import association_proxy
|
from sqlalchemy.ext.associationproxy import association_proxy
|
||||||
|
|
||||||
from mediagoblin.db.sql.extratypes import PathTupleWithSlashes
|
from mediagoblin.db.sql.extratypes import PathTupleWithSlashes
|
||||||
from mediagoblin.db.sql.base import GMGTableBase
|
from mediagoblin.db.sql.base import Base
|
||||||
from mediagoblin.db.mixin import UserMixin, MediaEntryMixin
|
from mediagoblin.db.mixin import UserMixin, MediaEntryMixin
|
||||||
|
|
||||||
|
|
||||||
Base = declarative_base(cls=GMGTableBase)
|
|
||||||
|
|
||||||
|
|
||||||
class SimpleFieldAlias(object):
|
class SimpleFieldAlias(object):
|
||||||
"""An alias for any field"""
|
"""An alias for any field"""
|
||||||
def __init__(self, fieldname):
|
def __init__(self, fieldname):
|
||||||
|
Loading…
x
Reference in New Issue
Block a user