aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElrond <elrond+mediagoblin.org@samba-tng.org>2011-12-24 18:20:20 +0100
committerElrond <elrond+mediagoblin.org@samba-tng.org>2012-01-20 00:00:57 +0100
commit92edc74e9b1ac16009db60049bb381bfd901013a (patch)
tree8c0c2fa7052a698ed9147a86918f675d45bf02a2
parent6fc8af3278173a0d1113dc0cf5525c2249f1d0bc (diff)
downloadmediagoblin-92edc74e9b1ac16009db60049bb381bfd901013a.tar.lz
mediagoblin-92edc74e9b1ac16009db60049bb381bfd901013a.tar.xz
mediagoblin-92edc74e9b1ac16009db60049bb381bfd901013a.zip
Use custom query class
A custom query class allows to add more methods on queries (read: "cursors"). This custom query class especially adds a .sort with a calling convention exactly like the mongo one. Makes a lot of existing code happy!
-rw-r--r--mediagoblin/db/sql/base.py22
1 files changed, 21 insertions, 1 deletions
diff --git a/mediagoblin/db/sql/base.py b/mediagoblin/db/sql/base.py
index 40140327..082d498e 100644
--- a/mediagoblin/db/sql/base.py
+++ b/mediagoblin/db/sql/base.py
@@ -1,7 +1,27 @@
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
-Session = scoped_session(sessionmaker())
+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(query_cls=GMGQuery))
def _fix_query_dict(query_dict):