Merge remote-tracking branch 'upstream/pull/4696'

[rails.git] / 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 0fd1dc5641fca2082054887bfe73eb077fd91de7..16eafd89da168ded4373d8f8baa5c1b9e090f956 100644 (file)
--- a/db/migrate/020_populate_node_tags_and_remove.rb
+++ b/db/migrate/020_populate_node_tags_and_remove.rb
@@ -1,6 +1,4 @@
-require "migrate"
-
-class PopulateNodeTagsAndRemove < ActiveRecord::Migration
+class PopulateNodeTagsAndRemove < ActiveRecord::Migration[4.2]
   def self.up
     have_nodes = select_value("SELECT count(*) FROM current_nodes").to_i.nonzero?
 
@@ -10,11 +8,11 @@ class PopulateNodeTagsAndRemove < ActiveRecord::Migration
       cmd = "db/migrate/020_populate_node_tags_and_remove_helper"
       src = "#{cmd}.c"
       if !File.exist?(cmd) || File.mtime(cmd) < File.mtime(src)
-        system("cc -O3 -Wall `mysql_config --cflags --libs` " +
-          "#{src} -o #{cmd}") || raise
+        system("cc -O3 -Wall `mysql_config --cflags --libs` " \
+               "#{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
 
@@ -38,8 +36,8 @@ class PopulateNodeTagsAndRemove < ActiveRecord::Migration
     create_table :node_tags, :id => false do |t|
       t.column :id,          :bigint, :null => false
       t.column :version,     :bigint, :null => false
-      t.column :k,          :string, :default => "", :null => false
-      t.column :v,          :string, :default => "", :null => false
+      t.column :k,           :string, :default => "", :null => false
+      t.column :v,           :string, :default => "", :null => false
     end
 
     # now get the data back