summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValery Sizov <valery@gitlab.com>2015-05-08 14:09:51 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-08 17:15:52 +0300
commitf876b7cae6fce508aa9b809d78305ea6f6289b46 (patch)
treee692468370db66e8f29e3be62414fafb03670c61
parentafff570522482b9949f567bda387498cf23d3706 (diff)
downloadgitlab-ce-f876b7cae6fce508aa9b809d78305ea6f6289b46.tar.gz
Merge branch 'quote_string' into 'master'
Adding quote_string to migration See merge request !630
-rw-r--r--db/migrate/20150425164647_remove_duplicate_tags.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/db/migrate/20150425164647_remove_duplicate_tags.rb b/db/migrate/20150425164647_remove_duplicate_tags.rb
index 1a9152cb965..13e5038db9c 100644
--- a/db/migrate/20150425164647_remove_duplicate_tags.rb
+++ b/db/migrate/20150425164647_remove_duplicate_tags.rb
@@ -1,7 +1,8 @@
class RemoveDuplicateTags < ActiveRecord::Migration
def up
select_all("SELECT name, COUNT(id) as cnt FROM tags GROUP BY name HAVING COUNT(id) > 1").each do |tag|
- duplicate_ids = select_all("SELECT id FROM tags WHERE name = '#{tag["name"]}'").map{|tag| tag["id"]}
+ tag_name = quote_string(tag["name"])
+ duplicate_ids = select_all("SELECT id FROM tags WHERE name = '#{tag_name}'").map{|tag| tag["id"]}
origin_tag_id = duplicate_ids.first
duplicate_ids.delete origin_tag_id