From aecd65b789c1c6094a6bf5d8c75987675fd9e4f3 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Wed, 27 Feb 2013 09:56:56 -0600 Subject: [PATCH] Simplifying the test for whether or not a user and slug combo exists. Thanks to tchernobog for catching this (it was breaking on postgres) and Elrond for the suggestion on how to fix it. This commit sponsored by Caleb Cooper. Thanks Caleb! --- mediagoblin/db/migrations.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py index e9b4e9ef..167c4f87 100644 --- a/mediagoblin/db/migrations.py +++ b/mediagoblin/db/migrations.py @@ -215,12 +215,10 @@ def mediaentry_new_slug_era(db): import uuid def slug_and_user_combo_exists(slug, uploader): - # Technically returns the number of entries with this slug and user - # that already exist return db.execute( media_table.select( and_(media_table.c.uploader==uploader, - media_table.c.slug==slug)).count()).first().tbl_row_count + media_table.c.slug==slug))).first() is not None def append_garbage_till_unique(row, new_slug): """ -- 2.25.1