Improve db schema for merge request diffs

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

2 files changed, 14 insertions, 1 deletions

diff --git a/db/migrate/20140122112253_create_merge_request_diffs.rb b/db/migrate/20140122112253_create_merge_request_diffs.rb
index f016ef0f061..ef592305a23 100644
--- a/db/migrate/20140122112253_create_merge_request_diffs.rb
+++ b/db/migrate/20140122112253_create_merge_request_diffs.rb
@@ -1,7 +1,7 @@
 class CreateMergeRequestDiffs < ActiveRecord::Migration
   def change
     create_table :merge_request_diffs do |t|
-      t.string :state, null: false, default: 'valid'
+      t.string :state, null: false, default: 'collected'
       t.text :st_commits, null: true, limit: 2147483647
       t.text :st_diffs, null: true, limit: 2147483647
       t.integer :merge_request_id, null: false
diff --git a/db/migrate/20140122122549_remove_m_rdiff_fields.rb b/db/migrate/20140122122549_remove_m_rdiff_fields.rb
new file mode 100644
index 00000000000..c27e649e9a3
--- /dev/null
+++ b/db/migrate/20140122122549_remove_m_rdiff_fields.rb
@@ -0,0 +1,13 @@
+class RemoveMRdiffFields < ActiveRecord::Migration
+  def up
+    remove_column :merge_requests, :st_commits
+    remove_column :merge_requests, :st_diffs
+  end
+
+  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"
+  end
+end