Merge branch 'master' into 0000-workbench-user-profile-wording-changes

[arvados.git] / services / api / db / migrate / 20140422011506_pipeline_instance_state.rb

diff --git a/services/api/db/migrate/20140422011506_pipeline_instance_state.rb b/services/api/db/migrate/20140422011506_pipeline_instance_state.rb
index cc153b99a435291469dc990d1fb68327aec5d89c..7643b18d85896af70786b348febd83f3b521a2d7 100644 (file)
--- a/services/api/db/migrate/20140422011506_pipeline_instance_state.rb
+++ b/services/api/db/migrate/20140422011506_pipeline_instance_state.rb
@@ -2,13 +2,10 @@ class PipelineInstanceState < ActiveRecord::Migration
   include CurrentApiClient
 
   def up
-    if !column_exists?(:pipeline_instances, :state)
-      add_column :pipeline_instances, :state, :string
-    end
+    add_column :pipeline_instances, :state, :string
+    add_column :pipeline_instances, :components_summary, :text
 
-    if !column_exists?(:pipeline_instances, :components_summary)
-      add_column :pipeline_instances, :components_summary, :text
-    end
+    PipelineInstance.reset_column_information
 
     act_as_system_user do
       PipelineInstance.all.each do |pi|