Merge remote-tracking branch 'upstream/pull/5389'

[rails.git] / db / migrate / 023_add_changesets.rb

diff --git a/db/migrate/023_add_changesets.rb b/db/migrate/023_add_changesets.rb
index 933a62cd5009a60d3a06375279dd7a652f56f107..ff6ce2bb4356db29f5680b3d871edde95699572b 100644 (file)
--- a/db/migrate/023_add_changesets.rb
+++ b/db/migrate/023_add_changesets.rb
@@ -1,6 +1,4 @@
-require "migrate"
-
-class AddChangesets < ActiveRecord::Migration
+class AddChangesets < ActiveRecord::Migration[4.2]

   @conv_user_tables = %w[current_nodes current_relations current_ways nodes relations ways]
 
   def self.up
   @conv_user_tables = %w[current_nodes current_relations current_ways nodes relations ways]
 
   def self.up


@@ -28,7 +26,7 @@ class AddChangesets < ActiveRecord::Migration
     # all edits up to the API change,
     # all the changesets will have the id of the user that made them.
     # We need to generate a changeset for each user in the database
     # all edits up to the API change,
     # all the changesets will have the id of the user that made them.
     # We need to generate a changeset for each user in the database

-    execute "INSERT INTO changesets (id, user_id, created_at, open)" +
+    execute "INSERT INTO changesets (id, user_id, created_at, open)" \

             "SELECT id, id, creation_time, false from users;"
 
     @conv_user_tables.each do |tbl|
             "SELECT id, id, creation_time, false from users;"
 
     @conv_user_tables.each do |tbl|