activerecord 5.0.7 → 5.1.7

data/lib/active_record/railties/databases.rake

@@ -1,4 +1,4 @@
-require 'active_record'
+require "active_record"
 
 db_namespace = namespace :db do
   desc "Set the environment value for the database"
@@ -7,7 +7,7 @@ db_namespace = namespace :db do
     ActiveRecord::InternalMetadata[:environment] = ActiveRecord::Migrator.current_environment
   end
 
-  task :check_protected_environments => [:environment, :load_config] do
+  task check_protected_environments: [:environment, :load_config] do
     ActiveRecord::Tasks::DatabaseTasks.check_protected_environments!
   end
 
@@ -17,24 +17,24 @@ db_namespace = namespace :db do
   end
 
   namespace :create do
-    task :all => :load_config do
+    task all: :load_config do
       ActiveRecord::Tasks::DatabaseTasks.create_all
     end
   end
 
-  desc 'Creates the database from DATABASE_URL or config/database.yml for the current RAILS_ENV (use db:create:all to create all databases in the config). Without RAILS_ENV or when RAILS_ENV is development, it defaults to creating the development and test databases.'
-  task :create => [:load_config] do
+  desc "Creates the database from DATABASE_URL or config/database.yml for the current RAILS_ENV (use db:create:all to create all databases in the config). Without RAILS_ENV or when RAILS_ENV is development, it defaults to creating the development and test databases."
+  task create: [:load_config] do
     ActiveRecord::Tasks::DatabaseTasks.create_current
   end
 
   namespace :drop do
-    task :all => [:load_config, :check_protected_environments] do
+    task all: [:load_config, :check_protected_environments] do
       ActiveRecord::Tasks::DatabaseTasks.drop_all
     end
   end
 
-  desc 'Drops the database from DATABASE_URL or config/database.yml for the current RAILS_ENV (use db:drop:all to drop all databases in the config). Without RAILS_ENV or when RAILS_ENV is development, it defaults to dropping the development and test databases.'
-  task :drop => [:load_config, :check_protected_environments] do
+  desc "Drops the database from DATABASE_URL or config/database.yml for the current RAILS_ENV (use db:drop:all to drop all databases in the config). Without RAILS_ENV or when RAILS_ENV is development, it defaults to dropping the development and test databases."
+  task drop: [:load_config, :check_protected_environments] do
     db_namespace["drop:_unsafe"].invoke
   end
 
@@ -43,20 +43,20 @@ db_namespace = namespace :db do
   end
 
   namespace :purge do
-    task :all => [:load_config, :check_protected_environments] do
+    task all: [:load_config, :check_protected_environments] do
       ActiveRecord::Tasks::DatabaseTasks.purge_all
     end
   end
 
   # desc "Empty the database from DATABASE_URL or config/database.yml for the current RAILS_ENV (use db:purge:all to purge all databases in the config). Without RAILS_ENV it defaults to purging the development and test databases."
-  task :purge => [:load_config, :check_protected_environments] do
+  task purge: [:load_config, :check_protected_environments] do
     ActiveRecord::Tasks::DatabaseTasks.purge_current
   end
 
   desc "Migrate the database (options: VERSION=x, VERBOSE=false, SCOPE=blog)."
-  task :migrate => [:environment, :load_config] do
+  task migrate: [:environment, :load_config] do
     ActiveRecord::Tasks::DatabaseTasks.migrate
-    db_namespace['_dump'].invoke
+    db_namespace["_dump"].invoke
   end
 
   # IMPORTANT: This task won't dump the schema if ActiveRecord::Base.dump_schema_after_migration is set to false
@@ -71,47 +71,47 @@ db_namespace = namespace :db do
     end
     # Allow this task to be called as many times as required. An example is the
     # migrate:redo task, which calls other two internally that depend on this one.
-    db_namespace['_dump'].reenable
+    db_namespace["_dump"].reenable
   end
 
   namespace :migrate do
     # desc  'Rollbacks the database one migration and re migrate up (options: STEP=x, VERSION=x).'
-    task :redo => [:environment, :load_config] do
+    task redo: [:environment, :load_config] do
       raise "Empty VERSION provided" if ENV["VERSION"] && ENV["VERSION"].empty?
 
-      if ENV['VERSION']
-        db_namespace['migrate:down'].invoke
-        db_namespace['migrate:up'].invoke
+      if ENV["VERSION"]
+        db_namespace["migrate:down"].invoke
+        db_namespace["migrate:up"].invoke
       else
-        db_namespace['rollback'].invoke
-        db_namespace['migrate'].invoke
+        db_namespace["rollback"].invoke
+        db_namespace["migrate"].invoke
       end
     end
 
     # desc 'Resets your database using your migrations for the current environment'
-    task :reset => ['db:drop', 'db:create', 'db:migrate']
+    task reset: ["db:drop", "db:create", "db:migrate"]
 
     # desc 'Runs the "up" for a given migration VERSION.'
-    task :up => [:environment, :load_config] do
+    task up: [:environment, :load_config] do
       raise "VERSION is required" if !ENV["VERSION"] || ENV["VERSION"].empty?
 
-      version = ENV['VERSION'] ? ENV['VERSION'].to_i : nil
+      version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
       ActiveRecord::Migrator.run(:up, ActiveRecord::Tasks::DatabaseTasks.migrations_paths, version)
-      db_namespace['_dump'].invoke
+      db_namespace["_dump"].invoke
     end
 
     # desc 'Runs the "down" for a given migration VERSION.'
-    task :down => [:environment, :load_config] do
+    task down: [:environment, :load_config] do
       raise "VERSION is required - To go down one migration, use db:rollback" if !ENV["VERSION"] || ENV["VERSION"].empty?
-      version = ENV['VERSION'] ? ENV['VERSION'].to_i : nil
+      version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
       ActiveRecord::Migrator.run(:down, ActiveRecord::Tasks::DatabaseTasks.migrations_paths, version)
-      db_namespace['_dump'].invoke
+      db_namespace["_dump"].invoke
     end
 
-    desc 'Display status of migrations'
-    task :status => [:environment, :load_config] do
+    desc "Display status of migrations"
+    task status: [:environment, :load_config] do
       unless ActiveRecord::SchemaMigration.table_exists?
-        abort 'Schema migrations table does not exist yet.'
+        abort "Schema migrations table does not exist yet."
       end
 
       # output
@@ -126,93 +126,93 @@ db_namespace = namespace :db do
     end
   end
 
-  desc 'Rolls the schema back to the previous version (specify steps w/ STEP=n).'
-  task :rollback => [:environment, :load_config] do
-    step = ENV['STEP'] ? ENV['STEP'].to_i : 1
+  desc "Rolls the schema back to the previous version (specify steps w/ STEP=n)."
+  task rollback: [:environment, :load_config] do
+    step = ENV["STEP"] ? ENV["STEP"].to_i : 1
     ActiveRecord::Migrator.rollback(ActiveRecord::Tasks::DatabaseTasks.migrations_paths, step)
-    db_namespace['_dump'].invoke
+    db_namespace["_dump"].invoke
   end
 
   # desc 'Pushes the schema to the next version (specify steps w/ STEP=n).'
-  task :forward => [:environment, :load_config] do
-    step = ENV['STEP'] ? ENV['STEP'].to_i : 1
+  task forward: [:environment, :load_config] do
+    step = ENV["STEP"] ? ENV["STEP"].to_i : 1
     ActiveRecord::Migrator.forward(ActiveRecord::Tasks::DatabaseTasks.migrations_paths, step)
-    db_namespace['_dump'].invoke
+    db_namespace["_dump"].invoke
   end
 
   # desc 'Drops and recreates the database from db/schema.rb for the current environment and loads the seeds.'
-  task :reset => [ 'db:drop', 'db:setup' ]
+  task reset: [ "db:drop", "db:setup" ]
 
   # desc "Retrieves the charset for the current environment's database"
-  task :charset => [:environment, :load_config] do
+  task charset: [:environment, :load_config] do
     puts ActiveRecord::Tasks::DatabaseTasks.charset_current
   end
 
   # desc "Retrieves the collation for the current environment's database"
-  task :collation => [:environment, :load_config] do
+  task collation: [:environment, :load_config] do
     begin
       puts ActiveRecord::Tasks::DatabaseTasks.collation_current
     rescue NoMethodError
-      $stderr.puts 'Sorry, your database adapter is not supported yet. Feel free to submit a patch.'
+      $stderr.puts "Sorry, your database adapter is not supported yet. Feel free to submit a patch."
     end
   end
 
-  desc 'Retrieves the current schema version number'
-  task :version => [:environment, :load_config] do
+  desc "Retrieves the current schema version number"
+  task version: [:environment, :load_config] do
     puts "Current version: #{ActiveRecord::Migrator.current_version}"
   end
 
   # desc "Raises an error if there are pending migrations"
-  task :abort_if_pending_migrations => [:environment, :load_config] do
+  task abort_if_pending_migrations: [:environment, :load_config] do
     pending_migrations = ActiveRecord::Migrator.open(ActiveRecord::Tasks::DatabaseTasks.migrations_paths).pending_migrations
 
     if pending_migrations.any?
       puts "You have #{pending_migrations.size} pending #{pending_migrations.size > 1 ? 'migrations:' : 'migration:'}"
       pending_migrations.each do |pending_migration|
-        puts '  %4d %s' % [pending_migration.version, pending_migration.name]
+        puts "  %4d %s" % [pending_migration.version, pending_migration.name]
       end
       abort %{Run `rails db:migrate` to update your database then try again.}
     end
   end
 
-  desc 'Creates the database, loads the schema, and initializes with the seed data (use db:reset to also drop the database first)'
-  task :setup => ['db:schema:load_if_ruby', 'db:structure:load_if_sql', :seed]
+  desc "Creates the database, loads the schema, and initializes with the seed data (use db:reset to also drop the database first)"
+  task setup: ["db:schema:load_if_ruby", "db:structure:load_if_sql", :seed]
 
-  desc 'Loads the seed data from db/seeds.rb'
+  desc "Loads the seed data from db/seeds.rb"
   task :seed do
-    db_namespace['abort_if_pending_migrations'].invoke
+    db_namespace["abort_if_pending_migrations"].invoke
     ActiveRecord::Tasks::DatabaseTasks.load_seed
   end
 
   namespace :fixtures do
     desc "Loads fixtures into the current environment's database. Load specific fixtures using FIXTURES=x,y. Load from subdirectory in test/fixtures using FIXTURES_DIR=z. Specify an alternative path (eg. spec/fixtures) using FIXTURES_PATH=spec/fixtures."
-    task :load => [:environment, :load_config] do
-      require 'active_record/fixtures'
+    task load: [:environment, :load_config] do
+      require "active_record/fixtures"
 
       base_dir = ActiveRecord::Tasks::DatabaseTasks.fixtures_path
 
-      fixtures_dir = if ENV['FIXTURES_DIR']
-                       File.join base_dir, ENV['FIXTURES_DIR']
-                     else
-                       base_dir
-                     end
+      fixtures_dir = if ENV["FIXTURES_DIR"]
+        File.join base_dir, ENV["FIXTURES_DIR"]
+      else
+        base_dir
+      end
 
-      fixture_files = if ENV['FIXTURES']
-                        ENV['FIXTURES'].split(',')
-                      else
-                        # The use of String#[] here is to support namespaced fixtures
-                        Dir["#{fixtures_dir}/**/*.yml"].map {|f| f[(fixtures_dir.size + 1)..-5] }
-                      end
+      fixture_files = if ENV["FIXTURES"]
+        ENV["FIXTURES"].split(",")
+      else
+        # The use of String#[] here is to support namespaced fixtures.
+        Dir["#{fixtures_dir}/**/*.yml"].map { |f| f[(fixtures_dir.size + 1)..-5] }
+      end
 
       ActiveRecord::FixtureSet.create_fixtures(fixtures_dir, fixture_files)
     end
 
     # desc "Search for a fixture given a LABEL or ID. Specify an alternative path (eg. spec/fixtures) using FIXTURES_PATH=spec/fixtures."
-    task :identify => [:environment, :load_config] do
-      require 'active_record/fixtures'
+    task identify: [:environment, :load_config] do
+      require "active_record/fixtures"
 
-      label, id = ENV['LABEL'], ENV['ID']
-      raise 'LABEL or ID required' if label.blank? && id.blank?
+      label, id = ENV["LABEL"], ENV["ID"]
+      raise "LABEL or ID required" if label.blank? && id.blank?
 
       puts %Q(The fixture ID for "#{label}" is #{ActiveRecord::FixtureSet.identify(label)}.) if label
 
@@ -233,39 +233,36 @@ db_namespace = namespace :db do
   end
 
   namespace :schema do
-    desc 'Creates a db/schema.rb file that is portable against any DB supported by Active Record'
-    task :dump => [:environment, :load_config] do
-      require 'active_record/schema_dumper'
-      filename = ENV['SCHEMA'] || File.join(ActiveRecord::Tasks::DatabaseTasks.db_dir, 'schema.rb')
+    desc "Creates a db/schema.rb file that is portable against any DB supported by Active Record"
+    task dump: [:environment, :load_config] do
+      require "active_record/schema_dumper"
+      filename = ENV["SCHEMA"] || File.join(ActiveRecord::Tasks::DatabaseTasks.db_dir, "schema.rb")
       File.open(filename, "w:utf-8") do |file|
         ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, file)
       end
-      db_namespace['schema:dump'].reenable
+      db_namespace["schema:dump"].reenable
     end
 
-    desc 'Loads a schema.rb file into the database'
-    task :load => [:environment, :load_config, :check_protected_environments] do
-      ActiveRecord::Tasks::DatabaseTasks.load_schema_current(:ruby, ENV['SCHEMA'])
+    desc "Loads a schema.rb file into the database"
+    task load: [:environment, :load_config, :check_protected_environments] do
+      ActiveRecord::Tasks::DatabaseTasks.load_schema_current(:ruby, ENV["SCHEMA"])
     end
 
-    task :load_if_ruby => ['db:create', :environment] do
+    task load_if_ruby: ["db:create", :environment] do
       db_namespace["schema:load"].invoke if ActiveRecord::Base.schema_format == :ruby
     end
 
     namespace :cache do
-      desc 'Creates a db/schema_cache.dump file.'
-      task :dump => [:environment, :load_config] do
-        con = ActiveRecord::Base.connection
-        filename = File.join(ActiveRecord::Tasks::DatabaseTasks.db_dir, "schema_cache.dump")
-
-        con.schema_cache.clear!
-        con.data_sources.each { |table| con.schema_cache.add(table) }
-        open(filename, 'wb') { |f| f.write(Marshal.dump(con.schema_cache)) }
+      desc "Creates a db/schema_cache.yml file."
+      task dump: [:environment, :load_config] do
+        conn = ActiveRecord::Base.connection
+        filename = File.join(ActiveRecord::Tasks::DatabaseTasks.db_dir, "schema_cache.yml")
+        ActiveRecord::Tasks::DatabaseTasks.dump_schema_cache(conn, filename)
       end
 
-      desc 'Clears a db/schema_cache.dump file.'
-      task :clear => [:environment, :load_config] do
-        filename = File.join(ActiveRecord::Tasks::DatabaseTasks.db_dir, "schema_cache.dump")
+      desc "Clears a db/schema_cache.yml file."
+      task clear: [:environment, :load_config] do
+        filename = File.join(ActiveRecord::Tasks::DatabaseTasks.db_dir, "schema_cache.yml")
         rm_f filename, verbose: false
       end
     end
@@ -273,53 +270,44 @@ db_namespace = namespace :db do
   end
 
   namespace :structure do
-    desc 'Dumps the database structure to db/structure.sql. Specify another file with SCHEMA=db/my_structure.sql'
-    task :dump => [:environment, :load_config] do
-      filename = ENV['SCHEMA'] || File.join(ActiveRecord::Tasks::DatabaseTasks.db_dir, "structure.sql")
+    desc "Dumps the database structure to db/structure.sql. Specify another file with SCHEMA=db/my_structure.sql"
+    task dump: [:environment, :load_config] do
+      filename = ENV["SCHEMA"] || File.join(ActiveRecord::Tasks::DatabaseTasks.db_dir, "structure.sql")
       current_config = ActiveRecord::Tasks::DatabaseTasks.current_config
       ActiveRecord::Tasks::DatabaseTasks.structure_dump(current_config, filename)
 
-      if ActiveRecord::Base.connection.supports_migrations? &&
-          ActiveRecord::SchemaMigration.table_exists?
+      if ActiveRecord::SchemaMigration.table_exists?
         File.open(filename, "a") do |f|
           f.puts ActiveRecord::Base.connection.dump_schema_information
           f.print "\n"
         end
       end
-      db_namespace['structure:dump'].reenable
+      db_namespace["structure:dump"].reenable
     end
 
     desc "Recreates the databases from the structure.sql file"
-    task :load => [:environment, :load_config, :check_protected_environments] do
-      ActiveRecord::Tasks::DatabaseTasks.load_schema_current(:sql, ENV['SCHEMA'])
+    task load: [:environment, :load_config, :check_protected_environments] do
+      ActiveRecord::Tasks::DatabaseTasks.load_schema_current(:sql, ENV["SCHEMA"])
     end
 
-    task :load_if_sql => ['db:create', :environment] do
+    task load_if_sql: ["db:create", :environment] do
       db_namespace["structure:load"].invoke if ActiveRecord::Base.schema_format == :sql
     end
   end
 
   namespace :test do
-
-    task :deprecated do
-      Rake.application.top_level_tasks.grep(/^db:test:/).each do |task|
-        $stderr.puts "WARNING: #{task} is deprecated. The Rails test helper now maintains " \
-                     "your test schema automatically, see the release notes for details."
-      end
-    end
-
     # desc "Recreate the test database from the current schema"
-    task :load => %w(db:test:purge) do
+    task load: %w(db:test:purge) do
       case ActiveRecord::Base.schema_format
-        when :ruby
-          db_namespace["test:load_schema"].invoke
-        when :sql
-          db_namespace["test:load_structure"].invoke
+      when :ruby
+        db_namespace["test:load_schema"].invoke
+      when :sql
+        db_namespace["test:load_structure"].invoke
       end
     end
 
     # desc "Recreate the test database from an existent schema.rb file"
-    task :load_schema => %w(db:test:purge) do
+    task load_schema: %w(db:test:purge) do
       begin
         should_reconnect = ActiveRecord::Base.connection_pool.active_connection?
         ActiveRecord::Schema.verbose = false
@@ -332,35 +320,19 @@ db_namespace = namespace :db do
     end
 
     # desc "Recreate the test database from an existent structure.sql file"
-    task :load_structure => %w(db:test:purge) do
+    task load_structure: %w(db:test:purge) do
       ActiveRecord::Tasks::DatabaseTasks.load_schema ActiveRecord::Base.configurations["test"], :sql, ENV["SCHEMA"], "test"
     end
 
-    # desc "Recreate the test database from a fresh schema"
-    task :clone => %w(db:test:deprecated environment) do
-      case ActiveRecord::Base.schema_format
-        when :ruby
-          db_namespace["test:clone_schema"].invoke
-        when :sql
-          db_namespace["test:clone_structure"].invoke
-      end
-    end
-
-    # desc "Recreate the test database from a fresh schema.rb file"
-    task :clone_schema => %w(db:test:deprecated db:schema:dump db:test:load_schema)
-
-    # desc "Recreate the test database from a fresh structure.sql file"
-    task :clone_structure => %w(db:test:deprecated db:structure:dump db:test:load_structure)
-
     # desc "Empty the test database"
-    task :purge => %w(environment load_config check_protected_environments) do
-      ActiveRecord::Tasks::DatabaseTasks.purge ActiveRecord::Base.configurations['test']
+    task purge: %w(environment load_config check_protected_environments) do
+      ActiveRecord::Tasks::DatabaseTasks.purge ActiveRecord::Base.configurations["test"]
     end
 
     # desc 'Load the test schema'
-    task :prepare => %w(environment load_config) do
+    task prepare: %w(environment load_config) do
       unless ActiveRecord::Base.configurations.blank?
-        db_namespace['test:load'].invoke
+        db_namespace["test:load"].invoke
       end
     end
   end
@@ -369,13 +341,13 @@ end
 namespace :railties do
   namespace :install do
     # desc "Copies missing migrations from Railties (e.g. engines). You can specify Railties to use with FROM=railtie1,railtie2"
-    task :migrations => :'db:load_config' do
-      to_load = ENV['FROM'].blank? ? :all : ENV['FROM'].split(",").map(&:strip)
+    task migrations: :'db:load_config' do
+      to_load = ENV["FROM"].blank? ? :all : ENV["FROM"].split(",").map(&:strip)
       railties = {}
       Rails.application.migration_railties.each do |railtie|
         next unless to_load == :all || to_load.include?(railtie.railtie_name)
 
-        if railtie.respond_to?(:paths) && (path = railtie.paths['db/migrate'].first)
+        if railtie.respond_to?(:paths) && (path = railtie.paths["db/migrate"].first)
           railties[railtie.railtie_name] = path
         end
       end
@@ -389,7 +361,7 @@ namespace :railties do
       end
 
       ActiveRecord::Migration.copy(ActiveRecord::Tasks::DatabaseTasks.migrations_paths.first, railties,
-                                    :on_skip => on_skip, :on_copy => on_copy)
+                                    on_skip: on_skip, on_copy: on_copy)
     end
   end
 end

data/lib/active_record/railties/jdbcmysql_error.rb

@@ -3,7 +3,7 @@ module ArJdbcMySQL #:nodoc:
   class Error < StandardError #:nodoc:
     attr_accessor :error_number, :sql_state
 
-    def initialize msg
+    def initialize(msg)
       super
       @error_number = nil
       @sql_state    = nil

data/lib/active_record/readonly_attributes.rb

@@ -11,12 +11,12 @@ module ActiveRecord
       # Attributes listed as readonly will be used to create a new record but update operations will
       # ignore these fields.
       def attr_readonly(*attributes)
-        self._attr_readonly = Set.new(attributes.map(&:to_s)) + (self._attr_readonly || [])
+        self._attr_readonly = Set.new(attributes.map(&:to_s)) + (_attr_readonly || [])
       end
 
       # Returns an array of all the attributes that have been specified as readonly.
       def readonly_attributes
-        self._attr_readonly
+        _attr_readonly
       end
     end
   end