Fix merge_request_diffs migrations for postgresql

1 files changed, 10 insertions, 2 deletions

diff --git a/db/migrate/20140122122549_remove_m_rdiff_fields.rb b/db/migrate/20140122122549_remove_m_rdiff_fields.rb
index c27e649e9a3..8f863d85a68 100644
--- a/db/migrate/20140122122549_remove_m_rdiff_fields.rb
+++ b/db/migrate/20140122122549_remove_m_rdiff_fields.rb
@@ -7,7 +7,15 @@ class RemoveMRdiffFields < ActiveRecord::Migration
   def down
     add_column :merge_requests, :st_commits, :text, null: true, limit: 2147483647
     add_column :merge_requests, :st_diffs, :text, null: true, limit: 2147483647
-    execute "UPDATE merge_requests mr, merge_request_diffs md SET mr.st_commits = md.st_commits WHERE md.merge_request_id = mr.id"
-    execute "UPDATE merge_requests mr, merge_request_diffs md SET mr.st_diffs = md.st_diffs WHERE md.merge_request_id = mr.id"
+
+    if ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
+      execute "UPDATE merge_requests mr
+              SET (st_commits, st_diffs) = (md.st_commits, md.st_diffs)
+              FROM merge_request_diffs md
+              WHERE md.merge_request_id = mr.id"
+    else
+      execute "UPDATE merge_requests mr, merge_request_diffs md SET mr.st_commits = md.st_commits WHERE md.merge_request_id = mr.id"
+      execute "UPDATE merge_requests mr, merge_request_diffs md SET mr.st_diffs = md.st_diffs WHERE md.merge_request_id = mr.id"
+    end
   end
 end