diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2012-01-10 08:12:30 -0600 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2012-01-10 08:12:30 -0600 |
| commit | 73079ac4b8a8b3b355867a1e98aca63313597ad0 (patch) | |
| tree | 614424e7222f81a29f82e580f5dc97baebffb1f6 /mediagoblin/db/sql/models.py | |
| parent | 1df68a3524d92caee5601a8acc011ac8e1fe16d4 (diff) | |
| parent | 914b8bcde3e01c2dd3e5679fb7733fc194b34d68 (diff) | |
| download | mediagoblin-73079ac4b8a8b3b355867a1e98aca63313597ad0.tar.lz mediagoblin-73079ac4b8a8b3b355867a1e98aca63313597ad0.tar.xz mediagoblin-73079ac4b8a8b3b355867a1e98aca63313597ad0.zip | |
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
Conflicts:
mediagoblin/db/mongo/models.py
Diffstat (limited to 'mediagoblin/db/sql/models.py')
| -rw-r--r-- | mediagoblin/db/sql/models.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mediagoblin/db/sql/models.py b/mediagoblin/db/sql/models.py index 31a6ed3b..95821b4f 100644 --- a/mediagoblin/db/sql/models.py +++ b/mediagoblin/db/sql/models.py @@ -7,6 +7,7 @@ from sqlalchemy import ( from sqlalchemy.orm import relationship from mediagoblin.db.sql.base import GMGTableBase +from mediagoblin.db.mixin import UserMixin, MediaEntryMixin Base = declarative_base(cls=GMGTableBase) @@ -24,7 +25,7 @@ class SimpleFieldAlias(object): setattr(instance, self.fieldname, val) -class User(Base): +class User(Base, UserMixin): __tablename__ = "users" id = Column(Integer, primary_key=True) @@ -48,7 +49,7 @@ class User(Base): _id = SimpleFieldAlias("id") -class MediaEntry(Base): +class MediaEntry(Base, MediaEntryMixin): __tablename__ = "media_entries" id = Column(Integer, primary_key=True) |