Committing extracted and compiled translations

[mediagoblin.git] / mediagoblin / db / util.py

diff --git a/mediagoblin/db/util.py b/mediagoblin/db/util.py
index 90383f811855bd02230f2084a36e433ec651efc6..7a0a3a73707b5330e039e3a76c78c6c45a6a73d8 100644 (file)
--- a/mediagoblin/db/util.py
+++ b/mediagoblin/db/util.py
@@ -24,17 +24,16 @@ from mediagoblin.db.models import MediaEntry, Tag, MediaTag, Collection
 
 
 def atomic_update(table, query_dict, update_values):
-    table.find(query_dict).update(update_values,
+    table.query.filter_by(**query_dict).update(update_values,
        synchronize_session=False)
     Session.commit()
 
 
-def check_media_slug_used(dummy_db, uploader_id, slug, ignore_m_id):
-    filt = (MediaEntry.uploader == uploader_id) \
-        & (MediaEntry.slug == slug)
+def check_media_slug_used(uploader_id, slug, ignore_m_id):
+    query = MediaEntry.query.filter_by(uploader=uploader_id, slug=slug)
     if ignore_m_id is not None:
-        filt = filt & (MediaEntry.id != ignore_m_id)
-    does_exist = Session.query(MediaEntry.id).filter(filt).first() is not None
+        query = query.filter(MediaEntry.id != ignore_m_id)
+    does_exist = query.first() is not None
     return does_exist
 
 
@@ -60,7 +59,7 @@ def clean_orphan_tags(commit=True):
         Session.commit()
 
 
-def check_collection_slug_used(dummy_db, creator_id, slug, ignore_c_id):
+def check_collection_slug_used(creator_id, slug, ignore_c_id):
     filt = (Collection.creator == creator_id) \
         & (Collection.slug == slug)
     if ignore_c_id is not None:
@@ -68,7 +67,6 @@ def check_collection_slug_used(dummy_db, creator_id, slug, ignore_c_id):
     does_exist = Session.query(Collection.id).filter(filt).first() is not None
     return does_exist
 
-
 if __name__ == '__main__':
     from mediagoblin.db.open import setup_connection_and_db_from_config