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

[rails.git] / db / migrate / 007_add_relations.rb

diff --git a/db/migrate/007_add_relations.rb b/db/migrate/007_add_relations.rb
index 4a0f74c526b8aa181ccbd224cfed7edb4ab61a79..29ba7ee3823f1cee0c9b5d19e0c3c03c3374e0c6 100644 (file)
--- a/db/migrate/007_add_relations.rb
+++ b/db/migrate/007_add_relations.rb
@@ -1,9 +1,7 @@
-require 'migrate'
-
-class AddRelations < ActiveRecord::Migration
+class AddRelations < ActiveRecord::Migration[4.2]

   def self.up
     # enums work like strings but are more efficient
   def self.up
     # enums work like strings but are more efficient

-    create_enumeration :nwr_enum, ["Node", "Way", "Relation"]
+    create_enum :nwr_enum, %w[Node Way Relation]

 
     # a relation can have members much like a way can have nodes.
     # differences:
 
     # a relation can have members much like a way can have nodes.
     # differences:


@@ -16,8 +14,8 @@ class AddRelations < ActiveRecord::Migration
       t.column "member_role", :string
     end
 
       t.column "member_role", :string
     end
 

-    add_primary_key "current_relation_members", ["id", "member_type", "member_id", "member_role"]
-    add_index "current_relation_members", ["member_type", "member_id"], :name => "current_relation_members_member_idx"
+    add_primary_key "current_relation_members", %w[id member_type member_id member_role]
+    add_index "current_relation_members", %w[member_type member_id], :name => "current_relation_members_member_idx"

     # the following is obsolete given the primary key, is it not?
     # add_index "current_relation_members", ["id"], :name => "current_relation_members_id_idx"
     create_table "current_relation_tags", :id => false do |t|
     # the following is obsolete given the primary key, is it not?
     # add_index "current_relation_members", ["id"], :name => "current_relation_members_id_idx"
     create_table "current_relation_tags", :id => false do |t|


@@ -44,8 +42,8 @@ class AddRelations < ActiveRecord::Migration
       t.column "version",     :bigint, :default => 0, :null => false
     end
 
       t.column "version",     :bigint, :default => 0, :null => false
     end
 

-    add_primary_key "relation_members", ["id", "version", "member_type", "member_id", "member_role"]
-    add_index "relation_members", ["member_type", "member_id"], :name => "relation_members_member_idx"
+    add_primary_key "relation_members", %w[id version member_type member_id member_role]
+    add_index "relation_members", %w[member_type member_id], :name => "relation_members_member_idx"

 
     create_table "relation_tags", :id => false do |t|
       t.column "id",      :bigint, :default => 0, :null => false
 
     create_table "relation_tags", :id => false do |t|
       t.column "id",      :bigint, :default => 0, :null => false


@@ -54,7 +52,7 @@ class AddRelations < ActiveRecord::Migration
       t.column "version", :bigint, :null => false
     end
 
       t.column "version", :bigint, :null => false
     end
 

-    add_index "relation_tags", ["id", "version"], :name => "relation_tags_id_version_idx"
+    add_index "relation_tags", %w[id version], :name => "relation_tags_id_version_idx"

 
     create_table "relations", :id => false do |t|
       t.column "id",        :bigint, :null => false, :default => 0
 
     create_table "relations", :id => false do |t|
       t.column "id",        :bigint, :null => false, :default => 0


@@ -64,7 +62,7 @@ class AddRelations < ActiveRecord::Migration
       t.column "visible",   :boolean, :null => false, :default => true
     end
 
       t.column "visible",   :boolean, :null => false, :default => true
     end
 

-    add_primary_key "relations", ["id", "version"]
+    add_primary_key "relations", %w[id version]

     add_index "relations", ["timestamp"], :name => "relations_timestamp_idx"
   end
 
     add_index "relations", ["timestamp"], :name => "relations_timestamp_idx"
   end