From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Wed, 27 Feb 2013 15:56:56 +0000 (-0600)
Subject: Simplifying the test for whether or not a user and slug combo exists.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=aecd65b789c1c6094a6bf5d8c75987675fd9e4f3;p=mediagoblin.git

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!
---

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):
         """