X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2d6c36d97bc8c39673be8efbab11ca64de1e89a2..86bb9e5a50cd38de813705d99ee63ebd4d15e079:/db/migrate/007_add_relations.rb

diff --git a/db/migrate/007_add_relations.rb b/db/migrate/007_add_relations.rb
index a30642e32..cb5410378 100644
--- a/db/migrate/007_add_relations.rb
+++ b/db/migrate/007_add_relations.rb
@@ -1,17 +1,20 @@
+require 'lib/migrate'
+
 class AddRelations < ActiveRecord::Migration
   def self.up
+    # enums work like strings but are more efficient
+    create_enumeration :nwr_enum, ["Node", "Way", "Relation"]
+
     # a relation can have members much like a way can have nodes.
     # differences:
     # way: only nodes / relation: any kind of member
     # way: ordered sequence of nodes / relation: free-form "role" string
     create_table "current_relation_members", innodb_table do |t|
-      t.column "id",          :bigint, :limit => 64, :null => false
-      t.column "member_type", :string, :limit => 11, :null => false
-      t.column "member_id",   :bigint, :limit => 11, :null => false
+      t.column "id",          :bigint,   :limit => 64, :null => false
+      t.column "member_type", :nwr_enum, :null => false
+      t.column "member_id",   :bigint,   :limit => 11, :null => false
       t.column "member_role", :string
     end
-    # enums work like strings but are more efficient
-    execute "alter table current_relation_members change column member_type member_type enum('node','way','relation');"
 
     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"
@@ -24,27 +27,23 @@ class AddRelations < ActiveRecord::Migration
     end
 
     add_index "current_relation_tags", ["id"], :name => "current_relation_tags_id_idx"
-    execute "CREATE FULLTEXT INDEX `current_relation_tags_v_idx` ON `current_relation_tags` (`v`)"
+    add_fulltext_index "current_relation_tags", "v"
 
     create_table "current_relations", innodb_table do |t|
-      t.column "id",        :bigint,   :limit => 64, :null => false
+      t.column "id",        :bigint_pk_64,           :null => false
       t.column "user_id",   :bigint,   :limit => 20, :null => false
       t.column "timestamp", :datetime, :null => false
       t.column "visible",   :boolean,  :null => false
     end
 
-    add_primary_key "current_relations", ["id"]
-    change_column "current_relations", "id", :bigint, :limit => 64, :null => false, :options => "AUTO_INCREMENT"
-
     create_table "relation_members", myisam_table do |t|
-      t.column "id",          :bigint,  :limit => 64, :default => 0, :null => false
-      t.column "member_type", :string, :limit => 11, :null => false
-      t.column "member_id",   :bigint, :limit => 11, :null => false
+      t.column "id",          :bigint,   :limit => 64, :default => 0, :null => false
+      t.column "member_type", :nwr_enum, :null => false
+      t.column "member_id",   :bigint,   :limit => 11, :null => false
       t.column "member_role", :string
-      t.column "version",     :bigint,  :limit => 20, :default => 0, :null => false
+      t.column "version",     :bigint,   :limit => 20, :default => 0, :null => false
     end
 
-    execute "alter table relation_members change column member_type member_type enum('node','way','relation');" 
     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"
 
@@ -68,7 +67,7 @@ class AddRelations < ActiveRecord::Migration
     add_primary_key "relations", ["id", "version"]
     add_index "relations", ["timestamp"], :name => "relations_timestamp_idx"
     
-    change_column "relations", "version", :bigint, :limit => 20, :null => false, :options => "AUTO_INCREMENT"
+    change_column "relations", "version", :bigint_auto_20
   end
 
 
@@ -79,5 +78,6 @@ class AddRelations < ActiveRecord::Migration
     drop_table :current_relation_tags
     drop_table :relation_members
     drop_table :current_relation_members
+    drop_enumeration :nwr_enum
   end
 end