projects
/
mediagoblin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'persona_resquash'
[mediagoblin.git]
/
mediagoblin
/
db
/
util.py
diff --git
a/mediagoblin/db/util.py
b/mediagoblin/db/util.py
index 529ef8b9a636ccfb8d54d75e36e399352945714b..8431361a89fc6dc6d22c962e238816fb9e3e0e60 100644
(file)
--- a/
mediagoblin/db/util.py
+++ b/
mediagoblin/db/util.py
@@
-24,7
+24,7
@@
from mediagoblin.db.models import MediaEntry, Tag, MediaTag, Collection
def atomic_update(table, query_dict, update_values):
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()
synchronize_session=False)
Session.commit()
@@
-59,7
+59,7
@@
def clean_orphan_tags(commit=True):
Session.commit()
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:
filt = (Collection.creator == creator_id) \
& (Collection.slug == slug)
if ignore_c_id is not None: