2 files changed, 3 insertions, 42 deletions
diff --git a/mediagoblin/db/sql/base.py b/mediagoblin/db/sql/base.py
index ca0c8166..2dceca75 100644
--- a/mediagoblin/db/sql/base.py
+++ b/mediagoblin/db/sql/base.py
@@ -35,35 +35,19 @@ class GMGQuery(Query):
             key_col = desc(key_col)
         return self.order_by(key_col)
 
-    def skip(self, amount):
-        return self.offset(amount)
-
 
 Session = scoped_session(sessionmaker(query_cls=GMGQuery))
 
 
-def _fix_query_dict(query_dict):
-    if '_id' in query_dict:
-        query_dict['id'] = query_dict.pop('_id')
-
-
 class GMGTableBase(object):
     query = Session.query_property()
 
     @classmethod
-    def find(cls, query_dict=None):
-        if query_dict is None:
-            query_dict = {}
-
-        _fix_query_dict(query_dict)
+    def find(cls, query_dict):
         return cls.query.filter_by(**query_dict)
 
     @classmethod
-    def find_one(cls, query_dict=None):
-        if query_dict is None:
-            query_dict = {}
-
-        _fix_query_dict(query_dict)
+    def find_one(cls, query_dict):
         return cls.query.filter_by(**query_dict).first()
 
     @classmethod
@@ -77,8 +61,7 @@ class GMGTableBase(object):
         # The key *has* to exist on sql.
         return getattr(self, key)
 
-    def save(self, validate=True):
-        assert validate
+    def save(self):
         sess = object_session(self)
         if sess is None:
             sess = Session()
diff --git a/mediagoblin/db/sql/models.py b/mediagoblin/db/sql/models.py
index b48c1fbe..4450e38d 100644
--- a/mediagoblin/db/sql/models.py
+++ b/mediagoblin/db/sql/models.py
@@ -44,18 +44,6 @@ from mediagoblin.db.sql.base import Session
 from migrate import changeset
 
 
-class SimpleFieldAlias(object):
-    """An alias for any field"""
-    def __init__(self, fieldname):
-        self.fieldname = fieldname
-
-    def __get__(self, instance, cls):
-        return getattr(instance, self.fieldname)
-
-    def __set__(self, instance, val):
-        setattr(instance, self.fieldname, val)
-
-
 class User(Base, UserMixin):
     """
     TODO: We should consider moving some rarely used fields
@@ -83,8 +71,6 @@ class User(Base, UserMixin):
     ## TODO
     # plugin data would be in a separate model
 
-    _id = SimpleFieldAlias("id")
-
     def __repr__(self):
         return '<{0} #{1} {2} {3} "{4}">'.format(
                 self.__class__.__name__,
@@ -161,8 +147,6 @@ class MediaEntry(Base, MediaEntryMixin):
     # media_data
     # fail_error
 
-    _id = SimpleFieldAlias("id")
-
     def get_comments(self, ascending=False):
         order_col = MediaComment.created
         if not ascending:
@@ -359,8 +343,6 @@ class MediaComment(Base, MediaCommentMixin):
 
     get_author = relationship(User)
 
-    _id = SimpleFieldAlias("id")
-
 
 class Collection(Base, CollectionMixin):
     __tablename__ = "core__collections"
@@ -383,8 +365,6 @@ class Collection(Base, CollectionMixin):
         return CollectionItem.query.filter_by(
             collection=self.id).order_by(order_col)
 
-    _id = SimpleFieldAlias("id")
-
 
 class CollectionItem(Base, CollectionItemMixin):
     __tablename__ = "core__collection_items"
@@ -400,8 +380,6 @@ class CollectionItem(Base, CollectionItemMixin):
 
     get_media_entry = relationship(MediaEntry)
 
-    _id = SimpleFieldAlias("id")
-
     __table_args__ = (
         UniqueConstraint('collection', 'media_entry'),
         {})