Merge pull request #1049 from dr-itz/rails61-dev

Rails 6.1 fixes

Author: enebo

test/rails/excludes/mysql2/ActiveRecord/ConnectionAdapters/ConnectionHandlerTest.rb

@@ -12,3 +12,4 @@
 exclude :test_establish_connection_using_two_level_configurations, 'tries to load SQLite3 driver'
 exclude :test_establish_connection_using_top_level_key_in_two_level_config, 'tries to load SQLite3 driver'
 exclude :test_symbolized_configurations_assignment, 'tries to load SQLite3 driver'
+exclude :test_establish_connection_with_primary_works_without_deprecation, 'tries to load SQLite3 driver'

test/rails/excludes/mysql2/TestDatabasesTest.rb

@@ -1,2 +1,3 @@
 exclude :test_databases_are_created, 'tries to load SQLite3 driver'
 exclude :test_create_databases_after_fork, 'tries to load SQLite3 driver'
+exclude :test_order_of_configurations_isnt_changed_by_test_databases, 'tries to load SQLite3 driver'

test/rails/excludes/postgresql/ActiveRecord/ConnectionAdapters/ConnectionHandlerTest.rb

@@ -12,3 +12,4 @@
 exclude :test_establish_connection_using_two_level_configurations, 'tries to load SQLite3 driver'
 exclude :test_establish_connection_using_top_level_key_in_two_level_config, 'tries to load SQLite3 driver'
 exclude :test_symbolized_configurations_assignment, 'tries to load SQLite3 driver'
+exclude :test_establish_connection_with_primary_works_without_deprecation, 'tries to load SQLite3 driver'

test/rails/excludes/postgresql/TestDatabasesTest.rb

@@ -1,2 +1,3 @@
 exclude :test_databases_are_created, 'tries to load SQLite3 driver'
 exclude :test_create_databases_after_fork, 'tries to load SQLite3 driver'
+exclude :test_order_of_configurations_isnt_changed_by_test_databases, 'tries to load SQLite3 driver'

test/rails/excludes/sqlite3/SQLite3TransactionTest.rb

@@ -1 +1 @@
-exclude :test_set_the_read_uncommited_PRAGMA_to_its_previous_value, 'uses sqlite3-ruby internals'
+exclude :test_set_the_read_uncommitted_PRAGMA_to_its_previous_value, 'uses sqlite3-ruby internals'