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

Rails 6.1 fixes

Author: enebo

.travis.yml

@@ -15,7 +15,7 @@ install:
 
 language: ruby
 rvm:
-  - jruby-9.2.7.0
+  - jruby-9.2.9.0
 jdk:
   - openjdk8
 
@@ -108,18 +108,18 @@ matrix:
       env: DB=mariadb PREPARED_STATEMENTS=true
 
     # Rails test-suite :
-    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="6-0-stable" # PS off by default
-    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="6-0-stable" PREPARED_STATEMENTS=true
-    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="6-0-stable" DRIVER=MariaDB
+    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="master" # PS off by default
+    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="master" PREPARED_STATEMENTS=true
+    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="master" DRIVER=MariaDB
 
     - addons:
         postgresql: "10"
-      env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="6-0-stable" # PS on by default
+      env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="master" # PS on by default
     - addons:
         postgresql: "10"
-      env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="6-0-stable" PREPARED_STATEMENTS=false
+      env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="master" PREPARED_STATEMENTS=false
     - addons:
         postgresql: "9.4"
-      env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="6-0-stable" # PS on by default
+      env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="master" # PS on by default
 
-    - env: DB=sqlite3    TEST_PREFIX="rails:" AR_VERSION="6-0-stable"
+    - env: DB=sqlite3    TEST_PREFIX="rails:" AR_VERSION="master"

Gemfile

@@ -59,7 +59,7 @@ end
 
 group :rails do
   group :test do
-    gem 'minitest', '~> 5.11.3', require: nil
+    gem 'minitest', '~> 5.12.2', require: nil
     gem 'minitest-excludes', '~> 2.0.1', require: nil
     gem 'minitest-rg', require: nil
 

bench/setup.rb

@@ -2,7 +2,22 @@
 
 require 'rubygems' unless defined? Gem
 
-gem 'activerecord', ENV['AR_VERSION'] if ENV['AR_VERSION']
+if ENV['RAILS']  # Use local clone of Rails
+  rails_dir = ENV['RAILS']
+
+  activerecord_dir = ::File.join(rails_dir, 'activerecord', 'lib')
+  if !::File.exist?(rails_dir) && !::File.exist?(activerecord_dir)
+    raise "ENV['RAILS'] set but does not point at a valid rails clone"
+  end
+  puts "--- Using AR from #{activerecord_dir}"
+
+  $LOAD_PATH << ::File.join(rails_dir, 'activesupport', 'lib')
+  $LOAD_PATH << ::File.join(rails_dir, 'activemodel', 'lib')
+  $LOAD_PATH << activerecord_dir
+elsif ENV['AR_VERSION']
+  gem 'activerecord', ENV['AR_VERSION']
+end
+
 require 'active_record'
 require 'active_record/version'
 
@@ -12,7 +27,7 @@
                       require 'arjdbc'
                       ArJdbc::VERSION
                     else
-                      $LOAD_PATH << File.expand_path('../lib', File.dirname(__FILE__))
+                      $LOAD_PATH.unshift File.expand_path('../lib', File.dirname(__FILE__))
                       require 'arjdbc'
                       "#{ArJdbc::VERSION} #{`git rev-parse HEAD`[0, 8]}"
                     end

lib/arjdbc/abstract/transaction_support.rb

@@ -24,26 +24,26 @@ def supports_transaction_isolation?
       # Starts a database transaction.
       # @override
       def begin_db_transaction
-        log('BEGIN TRANSACTION', nil) { @connection.begin }
+        log('BEGIN', 'TRANSACTION') { @connection.begin }
       end
 
       # Starts a database transaction.
       # @param isolation the transaction isolation to use
       def begin_isolated_db_transaction(isolation)
-        log("BEGIN ISOLATED TRANSACTION - #{isolation}", nil) { @connection.begin(isolation) }
+        log("BEGIN ISOLATED - #{isolation}", 'TRANSACTION') { @connection.begin(isolation) }
       end
 
       # Commits the current database transaction.
       # @override
       def commit_db_transaction
-        log('COMMIT TRANSACTION', nil) { @connection.commit }
+        log('COMMIT', 'TRANSACTION') { @connection.commit }
       end
 
       # Rolls back the current database transaction.
       # Called from 'rollback_db_transaction' in the AbstractAdapter
       # @override
       def exec_rollback_db_transaction
-        log('ROLLBACK TRANSACTION', nil) { @connection.rollback }
+        log('ROLLBACK', 'TRANSACTION') { @connection.rollback }
       end
 
       ########################## Savepoint Interface ############################
@@ -55,7 +55,7 @@ def exec_rollback_db_transaction
       # @since 1.3.0
       # @extension added optional name parameter
       def create_savepoint(name = current_savepoint_name)
-        log("SAVEPOINT #{name}", 'Savepoint') { @connection.create_savepoint(name) }
+        log("SAVEPOINT #{name}", 'TRANSACTION') { @connection.create_savepoint(name) }
       end
 
       # Transaction rollback to a given (previously created) save-point.
@@ -64,7 +64,7 @@ def create_savepoint(name = current_savepoint_name)
       # @param name the save-point name
       # @extension added optional name parameter
       def exec_rollback_to_savepoint(name = current_savepoint_name)
-        log("ROLLBACK TO SAVEPOINT #{name}", 'Savepoint') { @connection.rollback_savepoint(name) }
+        log("ROLLBACK TO SAVEPOINT #{name}", 'TRANSACTION') { @connection.rollback_savepoint(name) }
       end
 
       # Release a previously created save-point.
@@ -73,7 +73,7 @@ def exec_rollback_to_savepoint(name = current_savepoint_name)
       # @param name the save-point name
       # @extension added optional name parameter
       def release_savepoint(name = current_savepoint_name)
-        log("RELEASE SAVEPOINT #{name}", 'Savepoint') { @connection.release_savepoint(name) }
+        log("RELEASE SAVEPOINT #{name}", 'TRANSACTION') { @connection.release_savepoint(name) }
       end
 
     end

lib/arjdbc/mysql/adapter.rb

@@ -33,10 +33,10 @@ class Mysql2Adapter < AbstractMysqlAdapter
 
       include ArJdbc::MySQL
 
-      def initialize(connection, logger, connection_parameters, config)
-        super
+      def initialize(connection, logger, connection_options, config)
+        superclass_config = config.reverse_merge(prepared_statements: false)
+        super(connection, logger, connection_options, superclass_config)
 
-        @prepared_statements = false unless config.key?(:prepared_statements)
         # configure_connection taken care of at ArJdbc::Abstract::Core
       end
 
@@ -96,6 +96,15 @@ def write_query?(sql) # :nodoc:
         !READ_QUERY.match?(sql)
       end
 
+      def explain(arel, binds = [])
+        sql     = "EXPLAIN #{to_sql(arel, binds)}"
+        start   = Concurrent.monotonic_time
+        result  = exec_query(sql, "EXPLAIN", binds)
+        elapsed = Concurrent.monotonic_time - start
+
+        MySQL::ExplainPrettyPrinter.new.pp(result, elapsed)
+      end
+
       # Reloading the type map in abstract/statement_cache.rb blows up postgres
       def clear_cache!
         reload_type_map
@@ -179,7 +188,7 @@ def jdbc_column_class
 
       # defined in MySQL::DatabaseStatements which is not included
       def default_insert_value(column)
-        Arel.sql("DEFAULT") unless column.auto_increment?
+        super unless column.auto_increment?
       end
 
       # FIXME: optimize insert_fixtures_set by using JDBC Statement.addBatch()/executeBatch()

lib/arjdbc/postgresql/adapter.rb

@@ -303,6 +303,10 @@ def supports_optimizer_hints?
       @has_pg_hint_plan
     end
 
+    def supports_common_table_expressions?
+      true
+    end
+
     def supports_lazy_transactions?
       true
     end
@@ -379,13 +383,19 @@ def exec_insert(sql, name = nil, binds = [], pk = nil, sequence_name = nil)
       end
     end
 
+    def execute_batch(statements, name = nil)
+      execute(combine_multi_statements(statements), name)
+    end
+
     def explain(arel, binds = [])
       sql, binds = to_sql_and_binds(arel, binds)
       ActiveRecord::ConnectionAdapters::PostgreSQL::ExplainPrettyPrinter.new.pp(exec_query("EXPLAIN #{sql}", 'EXPLAIN', binds))
     end
 
     # from ActiveRecord::ConnectionAdapters::PostgreSQL::DatabaseStatements
-    READ_QUERY = ActiveRecord::ConnectionAdapters::AbstractAdapter.build_read_query_regexp(:begin, :commit, :explain, :select, :set, :show, :release, :savepoint, :rollback) # :nodoc:
+    READ_QUERY = ActiveRecord::ConnectionAdapters::AbstractAdapter.build_read_query_regexp(
+      :begin, :commit, :explain, :select, :set, :show, :release, :savepoint, :rollback, :with
+    ) # :nodoc:
     private_constant :READ_QUERY
 
     def write_query?(sql) # :nodoc:
@@ -434,8 +444,8 @@ def build_insert_sql(insert) # :nodoc:
       sql
     end
 
-    def build_truncate_statements(*table_names)
-      "TRUNCATE TABLE #{table_names.map(&method(:quote_table_name)).join(", ")}"
+    def build_truncate_statements(table_names)
+      ["TRUNCATE TABLE #{table_names.map(&method(:quote_table_name)).join(", ")}"]
     end
 
     def all_schemas

lib/arjdbc/postgresql/column.rb

@@ -48,7 +48,7 @@ def extract_default_function(default_value, default)
       end
 
       def has_default_function?(default_value, default)
-        !default_value && %r{\w+\(.*\)|\(.*\)::\w+|CURRENT_DATE|CURRENT_TIMESTAMP}.match?(default)
+        !default_value && default && %r{\w+\(.*\)|\(.*\)::\w+|CURRENT_DATE|CURRENT_TIMESTAMP}.match?(default)
       end
     end
 

lib/arjdbc/sqlite3/adapter.rb

@@ -97,6 +97,10 @@ def supports_json?
       true
     end
 
+    def supports_common_table_expressions?
+      database_version >= "3.8.3"
+    end
+
     def supports_insert_on_conflict?
       database_version >= "3.24.0"
     end
@@ -154,7 +158,9 @@ def disable_referential_integrity # :nodoc:
     # DATABASE STATEMENTS ======================================
     #++
 
-    READ_QUERY = ActiveRecord::ConnectionAdapters::AbstractAdapter.build_read_query_regexp(:begin, :commit, :explain, :select, :pragma, :release, :savepoint, :rollback) # :nodoc:
+    READ_QUERY = ActiveRecord::ConnectionAdapters::AbstractAdapter.build_read_query_regexp(
+      :begin, :commit, :explain, :select, :pragma, :release, :savepoint, :rollback, :with
+    ) # :nodoc:
     private_constant :READ_QUERY
 
     def write_query?(sql) # :nodoc:
@@ -181,15 +187,15 @@ def last_inserted_id(result)
     #def execute(sql, name = nil) #:nodoc:
 
     def begin_db_transaction #:nodoc:
-      log("begin transaction", nil) { @connection.transaction }
+      log("begin transaction", 'TRANSACTION') { @connection.transaction }
     end
 
     def commit_db_transaction #:nodoc:
-      log("commit transaction", nil) { @connection.commit }
+      log("commit transaction", 'TRANSACTION') { @connection.commit }
     end
 
     def exec_rollback_db_transaction #:nodoc:
-      log("rollback transaction", nil) { @connection.rollback }
+      log("rollback transaction", 'TRANSACTION') { @connection.rollback }
     end
 
     # SCHEMA STATEMENTS ========================================
@@ -199,8 +205,8 @@ def primary_keys(table_name) # :nodoc:
       pks.sort_by { |f| f["pk"] }.map { |f| f["name"] }
     end
 
-    def remove_index(table_name, options = {}) #:nodoc:
-      index_name = index_name_for_remove(table_name, options)
+    def remove_index(table_name, column_name, options = {}) #:nodoc:
+      index_name = index_name_for_remove(table_name, column_name, options)
       exec_query "DROP INDEX #{quote_column_name(index_name)}"
     end
 
@@ -209,14 +215,16 @@ def remove_index(table_name, options = {}) #:nodoc:
     # Example:
     #   rename_table('octopuses', 'octopi')
     def rename_table(table_name, new_name)
+      schema_cache.clear_data_source_cache!(table_name.to_s)
+      schema_cache.clear_data_source_cache!(new_name.to_s)
       exec_query "ALTER TABLE #{quote_table_name(table_name)} RENAME TO #{quote_table_name(new_name)}"
       rename_table_indexes(table_name, new_name)
     end
 
-    def add_column(table_name, column_name, type, options = {}) #:nodoc:
+    def add_column(table_name, column_name, type, **options) #:nodoc:
       if invalid_alter_table_type?(type, options)
         alter_table(table_name) do |definition|
-          definition.column(column_name, type, options)
+          definition.column(column_name, type, **options)
         end
       else
         super
@@ -317,11 +325,8 @@ def get_database_version # :nodoc:
       SQLite3Adapter::Version.new(query_value("SELECT sqlite_version(*)"))
     end
 
-    def build_truncate_statements(*table_names)
-      truncate_tables = table_names.map do |table_name|
-        "DELETE FROM #{quote_table_name(table_name)}"
-      end
-      combine_multi_statements(truncate_tables)
+    def build_truncate_statement(table_name)
+      "DELETE FROM #{quote_table_name(table_name)}"
     end
 
     def check_version
@@ -365,7 +370,7 @@ def alter_table(table_name, foreign_keys = foreign_keys(table_name), **options)
             fk.options[:column] = column
           end
           to_table = strip_table_name_prefix_and_suffix(fk.to_table)
-          definition.foreign_key(to_table, fk.options)
+          definition.foreign_key(to_table, **fk.options)
         end
 
         yield definition if block_given?
@@ -387,11 +392,12 @@ def move_table(from, to, options = {}, &block)
     def copy_table(from, to, options = {})
       from_primary_key = primary_key(from)
       options[:id] = false
-      create_table(to, options) do |definition|
+      create_table(to, **options) do |definition|
         @definition = definition
         if from_primary_key.is_a?(Array)
           @definition.primary_keys from_primary_key
         end
+
         columns(from).each do |column|
           column_name = options[:rename] ?
             (options[:rename][column.name] ||

lib/arjdbc/tasks/databases.rake

@@ -13,29 +13,31 @@ module ActiveRecord::Tasks
         ActiveRecord::Base.configurations.configs_for(env_name: env).each do |db_config|
           next if spec_name && spec_name != db_config.spec_name
 
-          yield adapt_jdbc_config(db_config.config), db_config.spec_name, env unless db_config.config['database'].blank?
+          if db_config.database
+            yield adapt_jdbc_config(db_config), db_config.spec_name, env
+          end
         end
       end
     end
 
     # @override patched to adapt jdbc configuration
     def each_local_configuration
       ActiveRecord::Base.configurations.configs_for.each do |db_config|
-        next unless db_config.config['database']
+        next unless db_config.database
 
-        if local_database?(db_config.config)
-          yield adapt_jdbc_config(db_config.config)
+        if local_database?(db_config)
+          yield adapt_jdbc_config(db_config)
         else
-          $stderr.puts "This task only modifies local databases. #{db_config.config['database']} is on a remote host."
+          $stderr.puts "This task only modifies local databases. #{db_config.database} is on a remote host."
         end
       end
     end
 
     private
 
-    def adapt_jdbc_config(config)
-      return config unless config['adapter']
-      config.merge 'adapter' => config['adapter'].sub(/^jdbc/, '')
+    def adapt_jdbc_config(db_config)
+      db_config.configuration_hash[:adapter] = db_config.adapter.sub(/^jdbc/, '') if db_config.adapter
+      db_config
     end
 
   end