1 files changed, 12 insertions, 28 deletions
diff --git a/db/post_migrate/20190404143330_add_unique_constraint_to_approvals_user_id_and_merge_request_id.rb b/db/post_migrate/20190404143330_add_unique_constraint_to_approvals_user_id_and_merge_request_id.rb
index 447f91ebc7e..dd85ebc8001 100644
--- a/db/post_migrate/20190404143330_add_unique_constraint_to_approvals_user_id_and_merge_request_id.rb
+++ b/db/post_migrate/20190404143330_add_unique_constraint_to_approvals_user_id_and_merge_request_id.rb
@@ -21,34 +21,18 @@ class AddUniqueConstraintToApprovalsUserIdAndMergeRequestId < ActiveRecord::Migr
   def remove_duplicates
     add_concurrent_index :approvals, [:user_id, :merge_request_id, :id]
 
-    if Gitlab::Database.mysql?
-      execute <<-SQL
-        DELETE FROM a
-        USING approvals AS a
-        INNER JOIN (
-          SELECT user_id, merge_request_id, MIN(id) as min_id
-          FROM approvals
-          GROUP BY user_id, merge_request_id
-          HAVING COUNT(id) > 1
-        ) as approvals_with_duplicates
-        ON approvals_with_duplicates.user_id = a.user_id
-        AND approvals_with_duplicates.merge_request_id = a.merge_request_id
-        WHERE approvals_with_duplicates.min_id <> a.id;
-      SQL
-    else
-      execute <<-SQL
-        DELETE FROM approvals
-        USING (
-          SELECT user_id, merge_request_id, MIN(id) as min_id
-          FROM approvals
-          GROUP BY user_id, merge_request_id
-          HAVING COUNT(id) > 1
-        ) as approvals_with_duplicates
-        WHERE approvals_with_duplicates.user_id = approvals.user_id
-        AND approvals_with_duplicates.merge_request_id = approvals.merge_request_id
-        AND approvals_with_duplicates.min_id <> approvals.id;
-      SQL
-    end
+    execute <<-SQL
+      DELETE FROM approvals
+      USING (
+        SELECT user_id, merge_request_id, MIN(id) as min_id
+        FROM approvals
+        GROUP BY user_id, merge_request_id
+        HAVING COUNT(id) > 1
+      ) as approvals_with_duplicates
+      WHERE approvals_with_duplicates.user_id = approvals.user_id
+      AND approvals_with_duplicates.merge_request_id = approvals.merge_request_id
+      AND approvals_with_duplicates.min_id <> approvals.id;
+    SQL
 
     remove_concurrent_index :approvals, [:user_id, :merge_request_id, :id]
   end