Merge branch 'master' into staging

4 files changed, 4 insertions, 4 deletions

diff --git a/db/migrate/20171109100955_add_object_id_format_to_workbenches.rb b/db/migrate/20171109100955_add_object_id_format_to_workbenches.rb
index 0e5e57643..f7e7452e1 100644
--- a/db/migrate/20171109100955_add_object_id_format_to_workbenches.rb
+++ b/db/migrate/20171109100955_add_object_id_format_to_workbenches.rb
@@ -1,5 +1,5 @@
 class AddObjectIdFormatToWorkbenches < ActiveRecord::Migration
   def change
-    add_column :workbenches, :objectid_format, :string
+    add_column :workbenches, :objectid_format, :string unless column_exists? :workbenches, :objectid_format
   end
 end
diff --git a/db/migrate/20171109101523_add_object_id_format_to_referential.rb b/db/migrate/20171109101523_add_object_id_format_to_referential.rb
index fed630b75..0a28fb10a 100644
--- a/db/migrate/20171109101523_add_object_id_format_to_referential.rb
+++ b/db/migrate/20171109101523_add_object_id_format_to_referential.rb
@@ -1,5 +1,5 @@
 class AddObjectIdFormatToReferential < ActiveRecord::Migration
   def change
-    add_column :referentials, :objectid_format, :string
+    add_column :referentials, :objectid_format, :string unless column_exists? :referentials, :objectid_format
   end
 end
diff --git a/db/migrate/20171109101545_add_object_id_format_to_line_referential.rb b/db/migrate/20171109101545_add_object_id_format_to_line_referential.rb
index 5d2fc9f4f..6578de73f 100644
--- a/db/migrate/20171109101545_add_object_id_format_to_line_referential.rb
+++ b/db/migrate/20171109101545_add_object_id_format_to_line_referential.rb
@@ -1,5 +1,5 @@
 class AddObjectIdFormatToLineReferential < ActiveRecord::Migration
   def change
-    add_column :line_referentials, :objectid_format, :string
+    add_column :line_referentials, :objectid_format, :string unless column_exists? :line_referentials, :objectid_format
   end
 end
diff --git a/db/migrate/20171109101605_add_object_id_format_to_stop_area_referential.rb b/db/migrate/20171109101605_add_object_id_format_to_stop_area_referential.rb
index ffa77e2ed..71c7d662a 100644
--- a/db/migrate/20171109101605_add_object_id_format_to_stop_area_referential.rb
+++ b/db/migrate/20171109101605_add_object_id_format_to_stop_area_referential.rb
@@ -1,5 +1,5 @@
 class AddObjectIdFormatToStopAreaReferential < ActiveRecord::Migration
   def change
-    add_column :stop_area_referentials, :objectid_format, :string
+    add_column :stop_area_referentials, :objectid_format, :string unless column_exists? :stop_area_referentials, :objectid_format
   end
 end