Preserve protocol in standard links

[rails.git] / db / migrate / 008_remove_segments.rb

diff --git a/db/migrate/008_remove_segments.rb b/db/migrate/008_remove_segments.rb
index 2820f82f8db667ce12443b5752096a47377d359f..8ca894d92b54d61773b9dd5f6b11d9fd6ceba32f 100644 (file)
--- a/db/migrate/008_remove_segments.rb
+++ b/db/migrate/008_remove_segments.rb
@@ -1,8 +1,8 @@
-require 'migrate'
+require "migrate"

 
 class RemoveSegments < ActiveRecord::Migration
   def self.up
 
 class RemoveSegments < ActiveRecord::Migration
   def self.up

-    have_segs = select_value("SELECT count(*) FROM current_segments").to_i != 0
+    have_segs = select_value("SELECT count(*) FROM current_segments").to_i.nonzero?

 
     if have_segs
       prefix = File.join Dir.tmpdir, "008_remove_segments.#{$PROCESS_ID}."
 
     if have_segs
       prefix = File.join Dir.tmpdir, "008_remove_segments.#{$PROCESS_ID}."


@@ -10,14 +10,14 @@ class RemoveSegments < ActiveRecord::Migration
       cmd = "db/migrate/008_remove_segments_helper"
       src = "#{cmd}.cc"
       if !File.exist?(cmd) || File.mtime(cmd) < File.mtime(src)
       cmd = "db/migrate/008_remove_segments_helper"
       src = "#{cmd}.cc"
       if !File.exist?(cmd) || File.mtime(cmd) < File.mtime(src)

-        system('c++ -O3 -Wall `mysql_config --cflags --libs` ' +
-          "#{src} -o #{cmd}") || fail
+        system("c++ -O3 -Wall `mysql_config --cflags --libs` " +
+          "#{src} -o #{cmd}") || raise

       end
 
       conn_opts = ActiveRecord::Base.connection
       end
 
       conn_opts = ActiveRecord::Base.connection

-                  .instance_eval { @connection_options }
+                                    .instance_eval { @connection_options }

       args = conn_opts.map(&:to_s) + [prefix]
       args = conn_opts.map(&:to_s) + [prefix]

-      fail "#{cmd} failed" unless system cmd, *args
+      raise "#{cmd} failed" unless system cmd, *args

 
       tempfiles = %w(ways way_nodes way_tags relations relation_members relation_tags)
                   .map { |base| prefix + base }
 
       tempfiles = %w(ways way_nodes way_tags relations relation_members relation_tags)
                   .map { |base| prefix + base }


@@ -53,7 +53,7 @@ class RemoveSegments < ActiveRecord::Migration
     # now get the data back
     csvopts = "FIELDS TERMINATED BY ',' ENCLOSED BY '\"' ESCAPED BY '\"' LINES TERMINATED BY '\\n'"
 
     # now get the data back
     csvopts = "FIELDS TERMINATED BY ',' ENCLOSED BY '\"' ESCAPED BY '\"' LINES TERMINATED BY '\\n'"
 

-    tempfiles.each { |fn| File.chmod 0644, fn } if have_segs
+    tempfiles.each { |fn| File.chmod 0o644, fn } if have_segs

 
     if have_segs
       execute "LOAD DATA INFILE '#{ways}' INTO TABLE ways #{csvopts} (id, user_id, timestamp) SET visible = 1, version = 1"
 
     if have_segs
       execute "LOAD DATA INFILE '#{ways}' INTO TABLE ways #{csvopts} (id, user_id, timestamp) SET visible = 1, version = 1"


@@ -81,6 +81,6 @@ class RemoveSegments < ActiveRecord::Migration
   end
 
   def self.down
   end
 
   def self.down

-    fail ActiveRecord::IrreversibleMigration
+    raise ActiveRecord::IrreversibleMigration

   end
 end
   end
 end