Set up virtualenv to use py2

[mediagoblin.git] / mediagoblin / db / base.py

diff --git a/mediagoblin/db/base.py b/mediagoblin/db/base.py
index 3530011e1cf878433837140fb3c511075e2ba80a..c0cefdc27024d2c9ba44c957f00c8baafc0c65ec 100644 (file)
--- a/mediagoblin/db/base.py
+++ b/mediagoblin/db/base.py
@@ -17,38 +17,13 @@
 
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import scoped_session, sessionmaker, object_session
-from sqlalchemy.orm.query import Query
 
-def _get_query_model(query):
-    cols = query.column_descriptions
-    assert len(cols) == 1, "These functions work only on simple queries"
-    return cols[0]["type"]
-
-
-class GMGQuery(Query):
-    def sort(self, key):
-        key_col = getattr(_get_query_model(self), key)
-        return self.order_by(key_col)
-
-
-Session = scoped_session(sessionmaker(query_cls=GMGQuery))
+Session = scoped_session(sessionmaker())
 
 
 class GMGTableBase(object):
     query = Session.query_property()
 
-    @classmethod
-    def find(cls, query_dict):
-        return cls.query.filter_by(**query_dict)
-
-    @classmethod
-    def find_one(cls, query_dict):
-        return cls.query.filter_by(**query_dict).first()
-
-    @classmethod
-    def one(cls, query_dict):
-        return cls.find(query_dict).one()
-
     def get(self, key):
         return getattr(self, key)