From 9e05f3196cbcef6ee00ed4d71ac69383b008bf78 Mon Sep 17 00:00:00 2001
From: Raphael Sofaer <raphael@joindiaspora.com>
Date: Wed, 6 Apr 2011 15:08:10 -0700
Subject: [PATCH] finish tag name uniqueness migration

---
 db/migrate/20110406203720_tag_name_uniqueness.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/db/migrate/20110406203720_tag_name_uniqueness.rb b/db/migrate/20110406203720_tag_name_uniqueness.rb
index ce2d09302..4e07f2060 100644
--- a/db/migrate/20110406203720_tag_name_uniqueness.rb
+++ b/db/migrate/20110406203720_tag_name_uniqueness.rb
@@ -17,11 +17,15 @@ SQL
       tag_ids = execute("SELECT tags.id FROM tags WHERE tags.name = '#{name}'").to_a.flatten!
       id_to_keep = tag_ids.pop
       execute <<SQL
-              UPDATE taggings
+              UPDATE IGNORE taggings
                 SET taggings.tag_id = #{id_to_keep}
                 WHERE taggings.tag_id IN (#{tag_ids.join(',')})
 SQL
-      execute("DELETE tags WHERE tags.id IN (#{tag_ids.join(',')})")
+      execute <<SQL
+        DELETE FROM taggings WHERE taggings.tag_id IN (#{tag_ids.join(',')})
+SQL
+
+      execute("DELETE FROM tags WHERE tags.id IN (#{tag_ids.join(',')})")
     end
   end