Remove custom GMQuery class

We provided a custom GMQuery class that offered a .sort() method for
compatibility with the Mongo syntax. Now that we have settled for sqlalchemy
which uses the order_by() method, we can safely remove this custom class
and move a little closer to "pure" and native sqlalchemy usage.

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>

2 files changed, 2 insertions, 15 deletions

diff --git a/mediagoblin/db/base.py b/mediagoblin/db/base.py
index 3530011e..699a503a 100644
--- a/mediagoblin/db/base.py
+++ b/mediagoblin/db/base.py
@@ -17,21 +17,8 @@
 
 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):
diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py
index fd9692f5..f115c3b8 100644
--- a/mediagoblin/user_pages/views.py
+++ b/mediagoblin/user_pages/views.py
@@ -514,7 +514,7 @@ def collection_atom_feed(request):
 
     cursor = CollectionItem.query.filter_by(
                  collection=collection.id) \
-                 .sort(CollectionItem.added.desc()) \
+                 .order_by(CollectionItem.added.desc()) \
                  .limit(ATOM_DEFAULT_NR_OF_UPDATED_ITEMS)
 
     """