From fef4bf320c3cefcb762b9eb4eb7a6b55654a97ac Mon Sep 17 00:00:00 2001
From: Anton Argirov <anton.argirov@gmail.com>
Date: Fri, 29 May 2015 19:55:46 +0600
Subject: [PATCH] #11: fixed migrations on Rails 2, 3

---
 .../20120908120613_fix_example_workflow.rb    | 30 -------------------
 .../20150526132244_create_example_workflow.rb |  9 ++----
 2 files changed, 3 insertions(+), 36 deletions(-)
 delete mode 100644 db/migrate/20120908120613_fix_example_workflow.rb

diff --git a/db/migrate/20120908120613_fix_example_workflow.rb b/db/migrate/20120908120613_fix_example_workflow.rb
deleted file mode 100644
index f757250..0000000
--- a/db/migrate/20120908120613_fix_example_workflow.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-class FixExampleWorkflow < ActiveRecord::Migration
-  def self.up
-    if workflow = CustomWorkflow.find_by_name("Duration/Done Ratio/Status correlation")
-      workflow.before_save = <<EOS
-if done_ratio_changed?
-  if done_ratio==100 && status_id==2
-    self.status_id=3
-  elsif [1,3,4].include?(status_id) && done_ratio<100
-    self.status_id=2
-  end
-end
-
-if status_id_changed?
-  if status_id==2
-    self.start_date ||= Time.now
-  end
-  if status_id==3
-    self.done_ratio = 100
-    self.start_date ||= created_on
-    self.due_date ||= Time.now
-  end
-end
-EOS
-      workflow.save
-    end
-  end
-
-  def self.down
-  end
-end
diff --git a/db/migrate/20150526132244_create_example_workflow.rb b/db/migrate/20150526132244_create_example_workflow.rb
index 7cd7099..e8b1f76 100644
--- 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 => 'anton.argirov@gmail.com', :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"