1 files changed, 39 insertions, 2 deletions
diff --git a/mediagoblin/db/sql/base.py b/mediagoblin/db/sql/base.py
index 40140327..6f45b21b 100644
--- a/mediagoblin/db/sql/base.py
+++ b/mediagoblin/db/sql/base.py
@@ -1,7 +1,44 @@
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011,2012 MediaGoblin contributors.  See AUTHORS.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
 from sqlalchemy.orm import scoped_session, sessionmaker, object_session
+from sqlalchemy.orm.query import Query
+from sqlalchemy.sql.expression import desc
+from mediagoblin.db.sql.fake import DESCENDING
+
+
+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, direction):
+        key_col = getattr(_get_query_model(self), key)
+        if direction is DESCENDING:
+            key_col = desc(key_col)
+        return self.order_by(key_col)
+
+    def skip(self, amount):
+        return self.offset(amount)
 
 
-Session = scoped_session(sessionmaker())
+Session = scoped_session(sessionmaker(query_cls=GMGQuery))
 
 
 def _fix_query_dict(query_dict):
@@ -29,7 +66,7 @@ class GMGTableBase(object):
     def get(self, key):
         return getattr(self, key)
 
-    def save(self, validate = True):
+    def save(self, validate=True):
         assert validate
         sess = object_session(self)
         if sess is None: