Merge branch 'newlayout' into newlayout-stage

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

diff --git a/mediagoblin/db/sql/base.py b/mediagoblin/db/sql/base.py
index 38b043345db604093373a49e069e62f58ab18e6b..838080b03f921c1ecafb812c1493ba2b8f44933c 100644 (file)
--- a/mediagoblin/db/sql/base.py
+++ b/mediagoblin/db/sql/base.py
@@ -1,7 +1,45 @@
-from sqlalchemy.orm import scoped_session, sessionmaker
+# 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/>.
 
 
-Session = scoped_session(sessionmaker())
+from sqlalchemy.ext.declarative import declarative_base
+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(query_cls=GMGQuery))
 
 
 def _fix_query_dict(query_dict):
@@ -24,6 +62,44 @@ class GMGTableBase(object):
 
     @classmethod
     def one(cls, query_dict):
-        retval = cls.find_one(query_dict)
-        assert retval is not None
-        return retval
+        return cls.find(query_dict).one()
+
+    def get(self, key):
+        return getattr(self, key)
+
+    def setdefault(self, key, defaultvalue):
+        # The key *has* to exist on sql.
+        return getattr(self, key)
+
+    def save(self, validate=True):
+        assert validate
+        sess = object_session(self)
+        if sess is None:
+            sess = Session()
+        sess.add(self)
+        sess.commit()
+
+    def delete(self):
+        sess = object_session(self)
+        assert sess is not None, "Not going to delete detached %r" % self
+        sess.delete(self)
+        sess.commit()
+
+
+Base = declarative_base(cls=GMGTableBase)
+
+
+class DictReadAttrProxy(object):
+    """
+    Maps read accesses to obj['key'] to obj.key
+    and hides all the rest of the obj
+    """
+    def __init__(self, proxied_obj):
+        self.proxied_obj = proxied_obj
+
+    def __getitem__(self, key):
+        try:
+            return getattr(self.proxied_obj, key)
+        except AttributeError:
+            raise KeyError("%r is not an attribute on %r"
+                % (key, self.proxied_obj))