#11: fixed migrations on Rails 2, 3

anteo · May 29, 2015 · fef4bf3 · fef4bf3
1 parent 977a5c7
commit fef4bf3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 36 deletions.
diff --git a/db/migrate/20120908120613_fix_example_workflow.rb b/db/migrate/20120908120613_fix_example_workflow.rb
diff --git a/db/migrate/20150526132244_create_example_workflow.rb b/db/migrate/20150526132244_create_example_workflow.rb
@@ -1,14 +1,11 @@
+
 class CreateExampleWorkflow < ActiveRecord::Migration
   def self.up
-<<<<<<< HEAD:db/migrate/20120831064944_create_example_workflow.rb
-    CustomWorkflow.create(:name => "Duration/Done Ratio/Status correlation", :description => <<EOD, :script => <<EOS)
-=======
     CustomWorkflow.reset_column_information
-    old = CustomWorkflow.find_by :name => 'Duration/Done Ratio/Status correlation'
+    old = CustomWorkflow.find(:first, :conditions => ['name=?', 'Duration/Done Ratio/Status correlation'])
     old.destroy if old
 
-    CustomWorkflow.create!(:name => 'Duration/Done Ratio/Status correlation', :author => '[email protected]', :description => <<EOD, :before_save => <<EOS)
->>>>>>> 75fa968... #8: fixed crash during migrations on new install:db/migrate/20150526132244_create_example_workflow.rb
+    CustomWorkflow.create!(:name => 'Duration/Done Ratio/Status correlation', :description => <<EOD, :script => <<EOS)
 Set up a correlation between the start date, due date, done ratio and status of issues.
 
 * If done ratio is changed to 100% and status is "In Process", status changes to "Resolved"