diff options
| author | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2013-01-07 13:03:51 +0100 |
|---|---|---|
| committer | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2013-01-07 13:42:32 +0100 |
| commit | 39dc3bf8db4a0a21220560a259574da4f2c1e12a (patch) | |
| tree | 67d97368d31cd224845c214d34bf282d59601893 /mediagoblin/db/models.py | |
| parent | a5acfe23fadc4772fdd6fd63091c32621b94d710 (diff) | |
| download | mediagoblin-39dc3bf8db4a0a21220560a259574da4f2c1e12a.tar.lz mediagoblin-39dc3bf8db4a0a21220560a259574da4f2c1e12a.tar.xz mediagoblin-39dc3bf8db4a0a21220560a259574da4f2c1e12a.zip | |
Mv db.sql.base to db.base
This concludes the db.sql.* -> db.* move. Our db abstraction layer is
sqlalchemy, so there is no need to a separate db.sql.* hierarchy.
All tests have been run for each of the commit series to make sure
everything works at every step.
Diffstat (limited to 'mediagoblin/db/models.py')
| -rw-r--r-- | mediagoblin/db/models.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py index 54f9abbc..ea915ae5 100644 --- a/mediagoblin/db/models.py +++ b/mediagoblin/db/models.py @@ -32,9 +32,8 @@ from sqlalchemy.ext.associationproxy import association_proxy from sqlalchemy.util import memoized_property from mediagoblin.db.extratypes import PathTupleWithSlashes, JSONEncoded -from mediagoblin.db.sql.base import Base, DictReadAttrProxy +from mediagoblin.db.base import Base, DictReadAttrProxy, Session from mediagoblin.db.mixin import UserMixin, MediaEntryMixin, MediaCommentMixin, CollectionMixin, CollectionItemMixin -from mediagoblin.db.sql.base import Session # It's actually kind of annoying how sqlalchemy-migrate does this, if # I understand it right, but whatever. Anyway, don't remove this :P |