Resolve merge conflict

2 files changed, 26 insertions, 0 deletions

diff --git a/db/migrate/20170808083322_change_referential_date_format_to_netex.rb b/db/migrate/20170808083322_change_referential_date_format_to_netex.rb
new file mode 100644
index 000000000..dc706942c
--- /dev/null
+++ b/db/migrate/20170808083322_change_referential_date_format_to_netex.rb
@@ -0,0 +1,9 @@
+class ChangeReferentialDateFormatToNetex < ActiveRecord::Migration
+  def up
+    execute "UPDATE referentials SET data_format = 'netex'"
+  end
+
+  def down
+    execute "UPDATE referentials SET data_format = 'neptune'"
+  end
+end
diff --git a/db/migrate/20170808091929_change_objectid_suffix.rb b/db/migrate/20170808091929_change_objectid_suffix.rb
new file mode 100644
index 000000000..da98e8b9d
--- /dev/null
+++ b/db/migrate/20170808091929_change_objectid_suffix.rb
@@ -0,0 +1,17 @@
+class ChangeObjectidSuffix < ActiveRecord::Migration
+  def tables
+    ['routes', 'journey_patterns', 'vehicle_journeys', 'time_tables', 'routing_constraint_zones']
+  end
+
+  def up
+    self.tables.each do |table|
+      execute "UPDATE #{table} SET objectid = (objectid || ':LOC')"
+    end
+  end
+
+  def down
+    self.tables.each do |table|
+      execute "UPDATE #{table} SET objectid = replace(objectid, ':LOC', '')"
+    end
+  end
+end