Remove mediagoblin.db.sql.fake.DESCENDING

This is the last remnant that requires us to keep db.sql.fake.py. Use
ModelName.desc() or sqlalchemy.sql.expression.desc(column) to achieve
descending sorts.

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
This commit is contained in:
Sebastian Spaeth
2013-01-07 11:15:04 +01:00
parent 208842590c
commit 0efe9e2796
7 changed files with 17 additions and 52 deletions

View File

@@ -18,9 +18,6 @@
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
@@ -29,10 +26,8 @@ def _get_query_model(query):
class GMGQuery(Query):
def sort(self, key, direction):
def sort(self, key):
key_col = getattr(_get_query_model(self), key)
if direction is DESCENDING:
key_col = desc(key_col)
return self.order_by(key_col)

View File

@@ -1,28 +0,0 @@
# 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/>.
"""
This module contains some fake classes and functions to
calm the rest of the code base. Or provide super minimal
implementations.
Currently:
- DESCENDING "constant"
"""
DESCENDING = object() # a unique object for this "constant"

View File

@@ -15,6 +15,5 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#TODO: check now after mongo removal if we can't rip out a layer of abstraction
from mediagoblin.db.sql.fake import DESCENDING
from mediagoblin.db.sql.util import atomic_update, check_media_slug_used, \
media_entries_for_tag_slug, check_collection_slug_used