Merge branch 'master' into set_binds

* master: (2794 commits)
  doc, API example on how to use `Model#exists?` with multiple IDs. [ci skip]
  Restore DATABASE_URL even if it's nil in connection_handler test
  [ci skip] - error_messages_for has been deprecated since 2.3.8 - lets reduce any confusion for users
  Ensure Active Record connection consistency
  Revert "ask the fixture set for the sql statements"
  Check `respond_to` before delegation due to: https://github.com/ruby/ruby/commit/d781caaf313b8649948c107bba277e5ad7307314
  Adding Hash#compact and Hash#compact! methods
  MySQL version 4.1 was EOL on December 31, 2009 We should at least recommend modern versions of MySQL to users.
  clear cache on body close so that cache remains during rendering
  add a more restricted codepath for templates fixes #13390
  refactor generator tests to use block form of Tempfile
  Fix typo [ci skip]
  Move finish_template as the last public method in the generator
  Minor typos fix [ci skip]
  make `change_column_null` reversible. Closes #13576.
  create/drop test and development databases only if RAILS_ENV is nil
  Revert "Speedup String#to"
  typo fix in test name. [ci skip].
  `core_ext/string/access.rb` test what we are documenting.
  Fix typo in image_tag documentation
  ...

Conflicts:
	activerecord/lib/active_record/associations/join_dependency/join_association.rb
	activerecord/lib/active_record/relation/query_methods.rb

7 files changed, 120 insertions, 362 deletions

diff --git a/activerecord/test/cases/tasks/database_tasks_test.rb b/activerecord/test/cases/tasks/database_tasks_test.rb
index e9000fef25..bf9e14fa4f 100644
--- a/activerecord/test/cases/tasks/database_tasks_test.rb
+++ b/activerecord/test/cases/tasks/database_tasks_test.rb
@@ -1,4 +1,5 @@
 require 'cases/helper'
+require 'active_record/tasks/database_tasks'
 
 module ActiveRecord
   module DatabaseTasksSetupper
@@ -128,11 +129,22 @@ module ActiveRecord
       )
     end
 
-    def test_creates_test_database_when_environment_is_database
+    def test_creates_test_and_development_databases_when_env_was_not_specified
       ActiveRecord::Tasks::DatabaseTasks.expects(:create).
         with('database' => 'dev-db')
       ActiveRecord::Tasks::DatabaseTasks.expects(:create).
         with('database' => 'test-db')
+      ENV.expects(:[]).with('RAILS_ENV').returns(nil)
+
+      ActiveRecord::Tasks::DatabaseTasks.create_current(
+        ActiveSupport::StringInquirer.new('development')
+      )
+    end
+
+    def test_creates_only_development_database_when_rails_env_is_development
+      ActiveRecord::Tasks::DatabaseTasks.expects(:create).
+        with('database' => 'dev-db')
+      ENV.expects(:[]).with('RAILS_ENV').returns('development')
 
       ActiveRecord::Tasks::DatabaseTasks.create_current(
         ActiveSupport::StringInquirer.new('development')
@@ -142,7 +154,7 @@ module ActiveRecord
     def test_establishes_connection_for_the_given_environment
       ActiveRecord::Tasks::DatabaseTasks.stubs(:create).returns true
 
-      ActiveRecord::Base.expects(:establish_connection).with('development')
+      ActiveRecord::Base.expects(:establish_connection).with(:development)
 
       ActiveRecord::Tasks::DatabaseTasks.create_current(
         ActiveSupport::StringInquirer.new('development')
@@ -238,11 +250,22 @@ module ActiveRecord
       )
     end
 
-    def test_creates_test_database_when_environment_is_database
+    def test_drops_test_and_development_databases_when_env_was_not_specified
       ActiveRecord::Tasks::DatabaseTasks.expects(:drop).
         with('database' => 'dev-db')
       ActiveRecord::Tasks::DatabaseTasks.expects(:drop).
         with('database' => 'test-db')
+      ENV.expects(:[]).with('RAILS_ENV').returns(nil)
+
+      ActiveRecord::Tasks::DatabaseTasks.drop_current(
+        ActiveSupport::StringInquirer.new('development')
+      )
+    end
+
+    def test_drops_only_development_database_when_rails_env_is_development
+      ActiveRecord::Tasks::DatabaseTasks.expects(:drop).
+        with('database' => 'dev-db')
+      ENV.expects(:[]).with('RAILS_ENV').returns('development')
 
       ActiveRecord::Tasks::DatabaseTasks.drop_current(
         ActiveSupport::StringInquirer.new('development')
diff --git a/activerecord/test/cases/tasks/firebird_rake_test.rb b/activerecord/test/cases/tasks/firebird_rake_test.rb
deleted file mode 100644
index c54989ae34..0000000000
--- a/activerecord/test/cases/tasks/firebird_rake_test.rb
+++ /dev/null
@@ -1,100 +0,0 @@
-require 'cases/helper'
-
-unless defined?(FireRuby::Database)
-module FireRuby
-  module Database; end
-end
-end
-
-module ActiveRecord
-  module FirebirdSetupper
-    def setup
-      @database      = 'db.firebird'
-      @connection    = stub :connection
-      @configuration = {
-        'adapter'  => 'firebird',
-        'database' => @database
-      }
-      ActiveRecord::Base.stubs(:connection).returns(@connection)
-      ActiveRecord::Base.stubs(:establish_connection).returns(true)
-
-      @tasks = Class.new(ActiveRecord::Tasks::FirebirdDatabaseTasks) do
-        def initialize(configuration)
-          ActiveSupport::Deprecation.silence { super }
-        end
-      end
-      ActiveRecord::Tasks::DatabaseTasks.stubs(:class_for_adapter).returns(@tasks) unless defined? ActiveRecord::ConnectionAdapters::FirebirdAdapter
-    end
-  end
-
-  class FirebirdDBCreateTest < ActiveRecord::TestCase
-    include FirebirdSetupper
-
-    def test_db_retrieves_create
-      message = capture(:stderr) do
-        ActiveRecord::Tasks::DatabaseTasks.create @configuration
-      end
-      assert_match(/not supported/, message)
-    end
-  end
- 
-  class FirebirdDBDropTest < ActiveRecord::TestCase
-    include FirebirdSetupper
-
-    def test_db_retrieves_drop
-      message = capture(:stderr) do
-        ActiveRecord::Tasks::DatabaseTasks.drop @configuration
-      end
-      assert_match(/not supported/, message)
-    end
-  end
- 
-  class FirebirdDBCharsetAndCollationTest < ActiveRecord::TestCase
-    include FirebirdSetupper
-
-    def test_db_retrieves_collation
-      assert_raise NoMethodError do
-        ActiveRecord::Tasks::DatabaseTasks.collation @configuration
-      end
-    end
-
-    def test_db_retrieves_charset
-      message = capture(:stderr) do
-        ActiveRecord::Tasks::DatabaseTasks.charset @configuration
-      end
-      assert_match(/not supported/, message)
-    end
-  end
-
-  class FirebirdStructureDumpTest < ActiveRecord::TestCase
-    include FirebirdSetupper
-
-    def setup
-      super
-      FireRuby::Database.stubs(:db_string_for).returns(@database)
-    end
-
-    def test_structure_dump
-      filename = "filebird.sql"
-      Kernel.expects(:system).with("isql -a #{@database} > #{filename}")
-
-      ActiveRecord::Tasks::DatabaseTasks.structure_dump(@configuration, filename)
-    end
-  end
-
-  class FirebirdStructureLoadTest < ActiveRecord::TestCase
-    include FirebirdSetupper
-
-    def setup
-      super
-      FireRuby::Database.stubs(:db_string_for).returns(@database)
-    end
-
-    def test_structure_load
-      filename = "firebird.sql"
-      Kernel.expects(:system).with("isql -i #{filename} #{@database}")
-
-      ActiveRecord::Tasks::DatabaseTasks.structure_load(@configuration, filename)
-    end
-  end
-end
diff --git a/activerecord/test/cases/tasks/mysql_rake_test.rb b/activerecord/test/cases/tasks/mysql_rake_test.rb
index 816bd62751..3e3a2828f3 100644
--- a/activerecord/test/cases/tasks/mysql_rake_test.rb
+++ b/activerecord/test/cases/tasks/mysql_rake_test.rb
@@ -65,99 +65,98 @@ module ActiveRecord
     end
   end
 
-  class MysqlDBCreateAsRootTest < ActiveRecord::TestCase
-    def setup
-      unless current_adapter?(:MysqlAdapter)
-        return skip("only tested on mysql")
+  if current_adapter?(:MysqlAdapter)
+    class MysqlDBCreateAsRootTest < ActiveRecord::TestCase
+      def setup
+        @connection    = stub("Connection", create_database: true)
+        @error         = Mysql::Error.new "Invalid permissions"
+        @configuration = {
+          'adapter'  => 'mysql',
+          'database' => 'my-app-db',
+          'username' => 'pat',
+          'password' => 'wossname'
+        }
+
+        $stdin.stubs(:gets).returns("secret\n")
+        $stdout.stubs(:print).returns(nil)
+        @error.stubs(:errno).returns(1045)
+        ActiveRecord::Base.stubs(:connection).returns(@connection)
+        ActiveRecord::Base.stubs(:establish_connection).
+          raises(@error).
+          then.returns(true)
       end
 
-      @connection    = stub("Connection", create_database: true)
-      @error         = Mysql::Error.new "Invalid permissions"
-      @configuration = {
-        'adapter'  => 'mysql',
-        'database' => 'my-app-db',
-        'username' => 'pat',
-        'password' => 'wossname'
-      }
-
-      $stdin.stubs(:gets).returns("secret\n")
-      $stdout.stubs(:print).returns(nil)
-      @error.stubs(:errno).returns(1045)
-      ActiveRecord::Base.stubs(:connection).returns(@connection)
-      ActiveRecord::Base.stubs(:establish_connection).
-        raises(@error).
-        then.returns(true)
-    end
+      if defined?(::Mysql)
+        def test_root_password_is_requested
+          assert_permissions_granted_for "pat"
+          $stdin.expects(:gets).returns("secret\n")
 
-    def test_root_password_is_requested
-      assert_permissions_granted_for "pat"
-      skip "only if mysql is available" unless defined?(::Mysql)
-      $stdin.expects(:gets).returns("secret\n")
+          ActiveRecord::Tasks::DatabaseTasks.create @configuration
+        end
+      end
 
-      ActiveRecord::Tasks::DatabaseTasks.create @configuration
-    end
+      def test_connection_established_as_root
+        assert_permissions_granted_for "pat"
+        ActiveRecord::Base.expects(:establish_connection).with(
+          'adapter'  => 'mysql',
+          'database' => nil,
+          'username' => 'root',
+          'password' => 'secret'
+        )
 
-    def test_connection_established_as_root
-      assert_permissions_granted_for "pat"
-      ActiveRecord::Base.expects(:establish_connection).with(
-        'adapter'  => 'mysql',
-        'database' => nil,
-        'username' => 'root',
-        'password' => 'secret'
-      )
+        ActiveRecord::Tasks::DatabaseTasks.create @configuration
+      end
 
-      ActiveRecord::Tasks::DatabaseTasks.create @configuration
-    end
+      def test_database_created_by_root
+        assert_permissions_granted_for "pat"
+        @connection.expects(:create_database).
+          with('my-app-db', :charset => 'utf8', :collation => 'utf8_unicode_ci')
 
-    def test_database_created_by_root
-      assert_permissions_granted_for "pat"
-      @connection.expects(:create_database).
-        with('my-app-db', :charset => 'utf8', :collation => 'utf8_unicode_ci')
+        ActiveRecord::Tasks::DatabaseTasks.create @configuration
+      end
 
-      ActiveRecord::Tasks::DatabaseTasks.create @configuration
-    end
+      def test_grant_privileges_for_normal_user
+        assert_permissions_granted_for "pat"
+        ActiveRecord::Tasks::DatabaseTasks.create @configuration
+      end
 
-    def test_grant_privileges_for_normal_user
-      assert_permissions_granted_for "pat"
-      ActiveRecord::Tasks::DatabaseTasks.create @configuration
-    end
+      def test_do_not_grant_privileges_for_root_user
+        @configuration['username'] = 'root'
+        @configuration['password'] = ''
+        ActiveRecord::Tasks::DatabaseTasks.create @configuration
+      end
 
-    def test_do_not_grant_privileges_for_root_user
-      @configuration['username'] = 'root'
-      @configuration['password'] = ''
-      ActiveRecord::Tasks::DatabaseTasks.create @configuration
-    end
+      def test_connection_established_as_normal_user
+        assert_permissions_granted_for "pat"
+        ActiveRecord::Base.expects(:establish_connection).returns do
+          ActiveRecord::Base.expects(:establish_connection).with(
+            'adapter'  => 'mysql',
+            'database' => 'my-app-db',
+            'username' => 'pat',
+            'password' => 'secret'
+          )
 
-    def test_connection_established_as_normal_user
-      assert_permissions_granted_for "pat"
-      ActiveRecord::Base.expects(:establish_connection).returns do
-        ActiveRecord::Base.expects(:establish_connection).with(
-          'adapter'  => 'mysql',
-          'database' => 'my-app-db',
-          'username' => 'pat',
-          'password' => 'secret'
-        )
+          raise @error
+        end
 
-        raise @error
+        ActiveRecord::Tasks::DatabaseTasks.create @configuration
       end
 
-      ActiveRecord::Tasks::DatabaseTasks.create @configuration
-    end
+      def test_sends_output_to_stderr_when_other_errors
+        @error.stubs(:errno).returns(42)
 
-    def test_sends_output_to_stderr_when_other_errors
-      @error.stubs(:errno).returns(42)
+        $stderr.expects(:puts).at_least_once.returns(nil)
 
-      $stderr.expects(:puts).at_least_once.returns(nil)
+        ActiveRecord::Tasks::DatabaseTasks.create @configuration
+      end
 
-      ActiveRecord::Tasks::DatabaseTasks.create @configuration
+      private
+        def assert_permissions_granted_for(db_user)
+          db_name = @configuration['database']
+          db_password = @configuration['password']
+          @connection.expects(:execute).with("GRANT ALL PRIVILEGES ON #{db_name}.* TO '#{db_user}'@'localhost' IDENTIFIED BY '#{db_password}' WITH GRANT OPTION;")
+        end
     end
-
-    private
-      def assert_permissions_granted_for(db_user)
-        db_name = @configuration['database']
-        db_password = @configuration['password']
-        @connection.expects(:execute).with("GRANT ALL PRIVILEGES ON #{db_name}.* TO '#{db_user}'@'localhost' IDENTIFIED BY '#{db_password}' WITH GRANT OPTION;")
-      end
   end
 
   class MySQLDBDropTest < ActiveRecord::TestCase
@@ -280,6 +279,15 @@ module ActiveRecord
 
       assert_match(/Could not dump the database structure/, warnings)
     end
+
+    def test_structure_dump_with_port_number
+      filename = "awesome-file.sql"
+      Kernel.expects(:system).with("mysqldump", "--port", "10000", "--result-file", filename, "--no-data", "test-db").returns(true)
+
+      ActiveRecord::Tasks::DatabaseTasks.structure_dump(
+        @configuration.merge('port' => 10000),
+        filename)
+    end
   end
 
   class MySQLStructureLoadTest < ActiveRecord::TestCase
diff --git a/activerecord/test/cases/tasks/oracle_rake_test.rb b/activerecord/test/cases/tasks/oracle_rake_test.rb
deleted file mode 100644
index 5f840febbc..0000000000
--- a/activerecord/test/cases/tasks/oracle_rake_test.rb
+++ /dev/null
@@ -1,93 +0,0 @@
-require 'cases/helper'
-
-module ActiveRecord
-  module OracleSetupper
-    def setup
-      @database      = 'db.oracle'
-      @connection    = stub :connection
-      @configuration = {
-        'adapter'  => 'oracle',
-        'database' => @database
-      }
-      ActiveRecord::Base.stubs(:connection).returns(@connection)
-      ActiveRecord::Base.stubs(:establish_connection).returns(true)
-
-      @tasks = Class.new(ActiveRecord::Tasks::OracleDatabaseTasks) do
-        def initialize(configuration)
-          ActiveSupport::Deprecation.silence { super }
-        end
-      end
-      ActiveRecord::Tasks::DatabaseTasks.stubs(:class_for_adapter).returns(@tasks) unless defined? ActiveRecord::ConnectionAdapters::OracleAdapter
-    end
-  end
-
-  class OracleDBCreateTest < ActiveRecord::TestCase
-    include OracleSetupper
-
-    def test_db_retrieves_create
-      message = capture(:stderr) do
-        ActiveRecord::Tasks::DatabaseTasks.create @configuration
-      end
-      assert_match(/not supported/, message)
-    end
-  end
- 
-  class OracleDBDropTest < ActiveRecord::TestCase
-    include OracleSetupper
-
-    def test_db_retrieves_drop
-      message = capture(:stderr) do
-        ActiveRecord::Tasks::DatabaseTasks.drop @configuration
-      end
-      assert_match(/not supported/, message)
-    end
-  end
- 
-  class OracleDBCharsetAndCollationTest < ActiveRecord::TestCase
-    include OracleSetupper
-
-    def test_db_retrieves_collation
-      assert_raise NoMethodError do
-        ActiveRecord::Tasks::DatabaseTasks.collation @configuration
-      end
-    end
-
-    def test_db_retrieves_charset
-      message = capture(:stderr) do
-        ActiveRecord::Tasks::DatabaseTasks.charset @configuration
-      end
-      assert_match(/not supported/, message)
-    end
-  end
-
-  class OracleStructureDumpTest < ActiveRecord::TestCase
-    include OracleSetupper
-
-    def setup
-      super
-      @connection.stubs(:structure_dump).returns("select sysdate from dual;")
-    end
-
-    def test_structure_dump
-      filename = "oracle.sql"
-      ActiveRecord::Tasks::DatabaseTasks.structure_dump(@configuration, filename)
-      assert File.exists?(filename)
-    ensure
-      FileUtils.rm_f(filename)
-    end
-  end
-
-  class OracleStructureLoadTest < ActiveRecord::TestCase
-    include OracleSetupper
-
-    def test_structure_load
-      filename = "oracle.sql"
-
-      open(filename, 'w') { |f| f.puts("select sysdate from dual;") }
-      @connection.stubs(:execute).with("select sysdate from dual;\n")
-      ActiveRecord::Tasks::DatabaseTasks.structure_load(@configuration, filename)
-    ensure
-      FileUtils.rm_f(filename)
-    end
-  end
-end
diff --git a/activerecord/test/cases/tasks/postgresql_rake_test.rb b/activerecord/test/cases/tasks/postgresql_rake_test.rb
index f31896bc7f..6ea225178f 100644
--- a/activerecord/test/cases/tasks/postgresql_rake_test.rb
+++ b/activerecord/test/cases/tasks/postgresql_rake_test.rb
@@ -206,7 +206,7 @@ module ActiveRecord
       @connection.expects(:schema_search_path).returns("foo")
 
       ActiveRecord::Tasks::DatabaseTasks.structure_dump(@configuration, filename)
-      assert File.exists?(filename)
+      assert File.exist?(filename)
     ensure
       FileUtils.rm(filename)
     end
@@ -231,6 +231,13 @@ module ActiveRecord
 
       ActiveRecord::Tasks::DatabaseTasks.structure_load(@configuration, filename)
     end
+
+    def test_structure_load_accepts_path_with_spaces
+      filename = "awesome file.sql"
+      Kernel.expects(:system).with("psql -q -f awesome\\ file.sql my-app-db")
+
+      ActiveRecord::Tasks::DatabaseTasks.structure_load(@configuration, filename)
+    end
   end
 
 end
diff --git a/activerecord/test/cases/tasks/sqlite_rake_test.rb b/activerecord/test/cases/tasks/sqlite_rake_test.rb
index 7209c0f14d..da3471adf9 100644
--- a/activerecord/test/cases/tasks/sqlite_rake_test.rb
+++ b/activerecord/test/cases/tasks/sqlite_rake_test.rb
@@ -159,8 +159,8 @@ module ActiveRecord
       filename = "awesome-file.sql"
 
       ActiveRecord::Tasks::DatabaseTasks.structure_dump @configuration, filename, '/rails/root'
-      assert File.exists?(dbfile)
-      assert File.exists?(filename)
+      assert File.exist?(dbfile)
+      assert File.exist?(filename)
     ensure
       FileUtils.rm_f(filename)
       FileUtils.rm_f(dbfile)
@@ -182,7 +182,7 @@ module ActiveRecord
 
       open(filename, 'w') { |f| f.puts("select datetime('now', 'localtime');") }
       ActiveRecord::Tasks::DatabaseTasks.structure_load @configuration, filename, '/rails/root'
-      assert File.exists?(dbfile)
+      assert File.exist?(dbfile)
     ensure
       FileUtils.rm_f(filename)
       FileUtils.rm_f(dbfile)
diff --git a/activerecord/test/cases/tasks/sqlserver_rake_test.rb b/activerecord/test/cases/tasks/sqlserver_rake_test.rb
deleted file mode 100644
index 0f1264b8ce..0000000000
--- a/activerecord/test/cases/tasks/sqlserver_rake_test.rb
+++ /dev/null
@@ -1,87 +0,0 @@
-require 'cases/helper'
-
-module ActiveRecord
-  module SqlserverSetupper
-    def setup
-      @database      = 'db.sqlserver'
-      @connection    = stub :connection
-      @configuration = {
-        'adapter'  => 'sqlserver',
-        'database' => @database,
-        'host'     => 'localhost',
-        'username' => 'username',
-        'password' => 'password',
-      }
-      ActiveRecord::Base.stubs(:connection).returns(@connection)
-      ActiveRecord::Base.stubs(:establish_connection).returns(true)
-
-      @tasks = Class.new(ActiveRecord::Tasks::SqlserverDatabaseTasks) do
-        def initialize(configuration)
-          ActiveSupport::Deprecation.silence { super }
-        end
-      end
-      ActiveRecord::Tasks::DatabaseTasks.stubs(:class_for_adapter).returns(@tasks) unless defined? ActiveRecord::ConnectionAdapters::SQLServerAdapter
-    end
-  end
-
-  class SqlserverDBCreateTest < ActiveRecord::TestCase
-    include SqlserverSetupper
-
-    def test_db_retrieves_create
-      message = capture(:stderr) do
-        ActiveRecord::Tasks::DatabaseTasks.create @configuration
-      end
-      assert_match(/not supported/, message)
-    end
-  end
- 
-  class SqlserverDBDropTest < ActiveRecord::TestCase
-    include SqlserverSetupper
-
-    def test_db_retrieves_drop
-      message = capture(:stderr) do
-        ActiveRecord::Tasks::DatabaseTasks.drop @configuration
-      end
-      assert_match(/not supported/, message)
-    end
-  end
- 
-  class SqlserverDBCharsetAndCollationTest < ActiveRecord::TestCase
-    include SqlserverSetupper
-
-    def test_db_retrieves_collation
-      assert_raise NoMethodError do
-        ActiveRecord::Tasks::DatabaseTasks.collation @configuration
-      end
-    end
-
-    def test_db_retrieves_charset
-      message = capture(:stderr) do
-        ActiveRecord::Tasks::DatabaseTasks.charset @configuration
-      end
-      assert_match(/not supported/, message)
-    end
-  end
-
-  class SqlserverStructureDumpTest < ActiveRecord::TestCase
-    include SqlserverSetupper
-
-    def test_structure_dump
-      filename = "sqlserver.sql"
-      Kernel.expects(:system).with("smoscript -s localhost -d #{@database} -u username -p password -f #{filename} -A -U")
-
-      ActiveRecord::Tasks::DatabaseTasks.structure_dump(@configuration, filename)
-    end
-  end
-
-  class SqlserverStructureLoadTest < ActiveRecord::TestCase
-    include SqlserverSetupper
-
-    def test_structure_load
-      filename = "sqlserver.sql"
-      Kernel.expects(:system).with("sqlcmd -S localhost -d #{@database} -U username -P password -i #{filename}")
-
-      ActiveRecord::Tasks::DatabaseTasks.structure_load(@configuration, filename)
-    end
-  end
-end