Merge pull request #19176 from imajes/master

Fixes reference for schema_format to AR::Base from AS::Base

activerecord/lib/active_record/tasks/database_tasks.rb

@@ -212,7 +212,7 @@ def load_schema_for(*args)
         load_schema(*args)
       end
 
-      def schema_file(format = ActiveSupport::Base.schema_format)
+      def schema_file(format = ActiveRecord::Base.schema_format)
         case format
         when :ruby
           File.join(db_dir, "schema.rb")

activerecord/test/cases/tasks/database_tasks_test.rb

@@ -377,4 +377,20 @@ def test_check_schema_file
       ActiveRecord::Tasks::DatabaseTasks.check_schema_file("awesome-file.sql")
     end
   end
+
+  class DatabaseTasksCheckSchemaFileDefaultsTest < ActiveRecord::TestCase
+    def test_check_schema_file_defaults
+      ActiveRecord::Tasks::DatabaseTasks.stubs(:db_dir).returns('/tmp')
+      assert_equal '/tmp/schema.rb', ActiveRecord::Tasks::DatabaseTasks.schema_file
+    end
+  end
+
+  class DatabaseTasksCheckSchemaFileSpecifiedFormatsTest < ActiveRecord::TestCase
+    {ruby: 'schema.rb', sql: 'structure.sql'}.each_pair do |fmt, filename|
+      define_method("test_check_schema_file_for_#{fmt}_format") do
+        ActiveRecord::Tasks::DatabaseTasks.stubs(:db_dir).returns('/tmp')
+        assert_equal "/tmp/#{filename}", ActiveRecord::Tasks::DatabaseTasks.schema_file(fmt)
+      end
+    end
+  end
 end