Add some missing _html suffixes

[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 d31d8844a804d9a53669c7da81b7ab2f30342aa4..f8a3085c6047b15b5cb06f24bf01115c1d03b7e7 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
+class RemoveSegments < ActiveRecord::Migration[4.2]

   def self.up
   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,16 +10,16 @@ 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` " +
+        system("c++ -O3 -Wall `mysql_config --cflags --libs` " \

           "#{src} -o #{cmd}") || raise
       end
 
           "#{src} -o #{cmd}") || raise
       end
 

-      conn_opts = ActiveRecord::Base.connection
-                                    .instance_eval { @connection_options }
+      conn_opts = ApplicationRecord.connection
+                                   .instance_eval { @connection_options }

       args = conn_opts.map(&:to_s) + [prefix]
       raise "#{cmd} failed" unless system cmd, *args
 
       args = conn_opts.map(&:to_s) + [prefix]
       raise "#{cmd} failed" unless system cmd, *args
 

-      tempfiles = %w(ways way_nodes way_tags relations relation_members relation_tags)
+      tempfiles = %w[ways way_nodes way_tags relations relation_members relation_tags]

                   .map { |base| prefix + base }
       ways, way_nodes, way_tags,
   relations, relation_members, relation_tags = tempfiles
                   .map { |base| prefix + base }
       ways, way_nodes, way_tags,
   relations, relation_members, relation_tags = tempfiles


@@ -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"