X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/037585db3933a2954b43bd4b30ea5e30ade00be2..cfd55f0c7d253b267190974901340b5bdd0c0bd6:/db/migrate/020_populate_node_tags_and_remove.rb diff --git a/db/migrate/020_populate_node_tags_and_remove.rb b/db/migrate/020_populate_node_tags_and_remove.rb index 63b7ea21a..e76ec6ee1 100644 --- a/db/migrate/020_populate_node_tags_and_remove.rb +++ b/db/migrate/020_populate_node_tags_and_remove.rb @@ -11,12 +11,12 @@ class PopulateNodeTagsAndRemove < ActiveRecord::Migration src = "#{cmd}.c" if !File.exist?(cmd) || File.mtime(cmd) < File.mtime(src) system("cc -O3 -Wall `mysql_config --cflags --libs` " + - "#{src} -o #{cmd}") || fail + "#{src} -o #{cmd}") || raise end conn_opts = ActiveRecord::Base.connection.instance_eval { @connection_options } args = conn_opts.map(&:to_s) + [prefix] - fail "#{cmd} failed" unless system cmd, *args + raise "#{cmd} failed" unless system cmd, *args tempfiles = %w(nodes node_tags current_nodes current_node_tags) .map { |base| prefix + base } @@ -56,7 +56,7 @@ class PopulateNodeTagsAndRemove < ActiveRecord::Migration end def self.down - fail ActiveRecord::IrreversibleMigration + raise ActiveRecord::IrreversibleMigration # add_column :nodes, "tags", :text, :default => "", :null => false # add_column :current_nodes, "tags", :text, :default => "", :null => false end