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

Rails 6.1 fixes

Author: kares

lib/arjdbc/postgresql/adapter.rb

@@ -213,6 +213,10 @@ def supports_partial_index?
       true
     end
 
+    def supports_partitioned_indexes?
+      database_version >= 110_000
+    end
+
     def supports_expression_index?
       true
     end
@@ -437,6 +441,7 @@ def build_insert_sql(insert) # :nodoc:
         sql << " ON CONFLICT #{insert.conflict_target} DO NOTHING"
       elsif insert.update_duplicates?
         sql << " ON CONFLICT #{insert.conflict_target} DO UPDATE SET "
+        sql << insert.touch_model_timestamps_unless { |column| "#{insert.model.quoted_table_name}.#{column} IS NOT DISTINCT FROM excluded.#{column}" }
         sql << insert.updatable_columns.map { |column| "#{column}=excluded.#{column}" }.join(",")
       end
 

lib/arjdbc/sqlite3/adapter.rb

@@ -346,6 +346,7 @@ def build_insert_sql(insert) # :nodoc:
         sql << " ON CONFLICT #{insert.conflict_target} DO NOTHING"
       elsif insert.update_duplicates?
         sql << " ON CONFLICT #{insert.conflict_target} DO UPDATE SET "
+        sql << insert.touch_model_timestamps_unless { |column| "#{column} IS excluded.#{column}" }
         sql << insert.updatable_columns.map { |column| "#{column}=excluded.#{column}" }.join(",")
       end
 

lib/arjdbc/tasks/databases.rake

@@ -5,16 +5,16 @@ module ActiveRecord::Tasks
   DatabaseTasks.module_eval do
 
     # @override patched to adapt jdbc configuration
-    def each_current_configuration(environment, spec_name = nil)
+    def each_current_configuration(environment, name = nil)
       environments = [environment]
       environments << 'test' if environment == 'development'
 
       environments.each do |env|
         ActiveRecord::Base.configurations.configs_for(env_name: env).each do |db_config|
-          next if spec_name && spec_name != db_config.spec_name
+          next if name && name != db_config.name
 
           if db_config.database
-            yield adapt_jdbc_config(db_config), db_config.spec_name, env
+            yield adapt_jdbc_config(db_config), db_config.name, env
           end
         end
       end
@@ -38,7 +38,7 @@ module ActiveRecord::Tasks
     def adapt_jdbc_config(db_config)
       if db_config.adapter.start_with? 'jdbc'
         config = db_config.configuration_hash.merge(adapter: db_config.adapter.sub(/^jdbc/, ''))
-        db_config = ActiveRecord::DatabaseConfigurations::HashConfig.new(db_config.env_name, db_config.spec_name, config)
+        db_config = ActiveRecord::DatabaseConfigurations::HashConfig.new(db_config.env_name, db_config.name, config)
       end
       db_config
     end

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

@@ -0,0 +1,13 @@
+#
+# These tests all try various multi-DB things, using an SQLite3 database. When
+# running the Rails tests from AR-JDBC, the SQLite3 JARs are not on the search
+# path so this fails.
+#
+exclude :test_establish_connection_using_3_levels_config, 'tries to load SQLite3 driver'
+exclude :test_establish_connection_using_3_levels_config_with_shards_and_replica, 'tries to load SQLite3 driver'
+exclude :test_switching_connections_via_handler, 'tries to load SQLite3 driver'
+exclude :test_retrieves_proper_connection_with_nested_connected_to, 'tries to load SQLite3 driver'
+exclude :test_same_shards_across_clusters, 'tries to load SQLite3 driver'
+exclude :test_sharding_separation, 'tries to load SQLite3 driver'
+exclude :test_swapping_shards_in_a_multi_threaded_environment, 'tries to load SQLite3 driver'
+exclude :test_swapping_shards_and_roles_in_a_multi_threaded_environment, 'tries to load SQLite3 driver'

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

@@ -0,0 +1,13 @@
+#
+# These tests all try various multi-DB things, using an SQLite3 database. When
+# running the Rails tests from AR-JDBC, the SQLite3 JARs are not on the search
+# path so this fails.
+#
+exclude :test_establish_connection_using_3_levels_config, 'tries to load SQLite3 driver'
+exclude :test_establish_connection_using_3_levels_config_with_shards_and_replica, 'tries to load SQLite3 driver'
+exclude :test_switching_connections_via_handler, 'tries to load SQLite3 driver'
+exclude :test_retrieves_proper_connection_with_nested_connected_to, 'tries to load SQLite3 driver'
+exclude :test_same_shards_across_clusters, 'tries to load SQLite3 driver'
+exclude :test_sharding_separation, 'tries to load SQLite3 driver'
+exclude :test_swapping_shards_in_a_multi_threaded_environment, 'tries to load SQLite3 driver'
+exclude :test_swapping_shards_and_roles_in_a_multi_threaded_environment, 'tries to load SQLite3 driver'