X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1ac9ea1f06e66cac4ef2557b95660fdcfa2fd176..6f9ad2eab60b45266e1287da58406e1aa25fd708:/db/migrate/008_remove_segments.rb?ds=sidebyside diff --git a/db/migrate/008_remove_segments.rb b/db/migrate/008_remove_segments.rb index 8c049b62a..ce49e9cca 100644 --- a/db/migrate/008_remove_segments.rb +++ b/db/migrate/008_remove_segments.rb @@ -1,4 +1,4 @@ -require 'lib/migrate' +require 'migrate' class RemoveSegments < ActiveRecord::Migration def self.up @@ -44,6 +44,7 @@ class RemoveSegments < ActiveRecord::Migration t.column :sequence_id, :bigint, :limit => 11, :null => false end add_primary_key :current_way_nodes, [:id, :sequence_id] + add_index :current_way_nodes, [:node_id], :name => "current_way_nodes_node_idx" execute "TRUNCATE way_tags" execute "TRUNCATE ways" @@ -65,9 +66,6 @@ class RemoveSegments < ActiveRecord::Migration execute "INSERT INTO current_way_tags SELECT id, k, v FROM way_tags" end - # and then readd the index - add_index :current_way_nodes, [:node_id], :name => "current_way_nodes_node_idx" - if have_segs execute "LOAD DATA INFILE '#{relations}' INTO TABLE relations #{csvopts} (id, user_id, timestamp) SET visible = 1, version = 1" execute "LOAD DATA INFILE '#{relation_members}' INTO TABLE relation_members #{csvopts} (id, member_type, member_id, member_role) SET version = 1" @@ -84,6 +82,6 @@ class RemoveSegments < ActiveRecord::Migration end def self.down - raise IrreversibleMigration.new + raise ActiveRecord::IrreversibleMigration end end