activerecord-jdbc-adapter 61.2-java → 70.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa4df302770068a233f5d07c6af210f49bddca54244ab09ecc3419ba3128918d
-  data.tar.gz: a1f4a473192ba55a305a8d62595fef416f00471a9d8957137966876325a25d03
+  metadata.gz: 79e198f6d1579290fb0eeb3597282367757655bcff41b3e848a788b557573706
+  data.tar.gz: 935a5c332bf06b2d77ca47ae6fc92128cbf450e1c50d64a293ef02ef2a04ad07
 SHA512:
-  metadata.gz: 6d6d41aa2bcbb0e9583e2c09c7b8b46357910def331a5bf9869f1eaf95199c6797f012ac57ef58dd2d144f4c6d7d46a86f52f87e55e24d7bf5166105355f760d
-  data.tar.gz: 66ccf4e7075f94b6505669052f93bad576f4a6cb49ace225c049ce68a9d4302d2114352737f43bf0d8392de8c2a8ee1b28387caa2dda3e849880a7c8b82f42d6
+  metadata.gz: b124009ca502a4e24c88a5fc1ff0a8a307e1850db491ae0cf12f0388753cccb575fff87f2421ec725dc9a945e335d2f6f8de1c7734ee6887f887d380e6726a68
+  data.tar.gz: 82faa67a43955a2ff946510c3a77826365eb6dbd3adc7e7c81eecd83da03ce10ca37f0100a32b7089a3ef88014797a2960561851c701d695fe943f11f2712aae

data/.github/workflows/ruby.yml

@@ -1,10 +1,17 @@
-name: Run ARJDBC and Rails tests
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
 
 on:
   push:
-    branches: [ 61-stable, master ]
+    branches: [ master ]
   pull_request:
-    branches: [ 61-stable, master ]
+    branches: [ master ]
 
 permissions:
   contents: read
@@ -17,10 +24,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['jruby-9.2.20.1']
+        ruby-version: ['jruby-head']
         db: ['mysql2']
         test_targets: ["rails:test_mysql2"]
-        ar_version: ["6-1-stable"]
+        ar_version: ["7-0-stable"]
         prepared_statements: ['false', 'true']
         driver: ['MySQL']
 
@@ -69,10 +76,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: [ 'jruby-9.2.20.1' ]
+        ruby-version: [ 'jruby-head' ]
         db: [ 'postgresql' ]
         test_targets: [ "rails:test_postgresql" ]
-        ar_version: ["6-1-stable"]
+        ar_version: ["7-0-stable"]
         prepared_statements: [ 'false', 'true' ]
 
     services:
@@ -119,10 +126,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['jruby-9.2.20.1']
+        ruby-version: ['jruby-head']
         db: ['sqlite3']
         test_targets: ["rails:test_sqlite3"]
-        ar_version: ["6-1-stable"]
+        ar_version: ["7-0-stable"]
 
     env:
       DB: ${{ matrix.db }}
@@ -151,7 +158,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['jruby-9.2.20.1']
+        ruby-version: ['jruby-head']
         db: ['mysql2']
         test_targets: ["db:mysql test_mysql2"]
         prepared_statements: ['false', 'true']
@@ -196,7 +203,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['jruby-9.2.20.1']
+        ruby-version: ['jruby-head']
         db: ['postgresql']
         test_targets: ["db:postgresql test_postgresql"]
         prepared_statements: ['false', 'true']
@@ -243,7 +250,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['jruby-9.2.20.1']
+        ruby-version: ['jruby-head']
         db: ['sqlite3']
         test_targets: ['test_sqlite3']
 

data/.travis.yml

@@ -9,14 +9,13 @@ before_install:
   - rvm @default,@global do gem uninstall bundler -a -x -I || true
   - gem install bundler -v "~>1.17.3"
 install:
-- bundle config set --local without 'development'
-- bundle install
+- bundle install --retry 3 --without development
 # to fix this issue: https://travis-ci.community/t/mariadb-10-1-fails-to-install-on-xenial/3151/3
 - mysql -u root -e 'CREATE USER IF NOT EXISTS travis@localhost; GRANT ALL ON *.* TO travis@localhost;' || true
 
 language: ruby
 rvm:
-  - jruby-9.2.19.0
+  - jruby-9.2.14.0
 jdk:
   - openjdk8
 
@@ -49,7 +48,7 @@ before_script:
 
 env:
   global:
-    - AR_VERSION="6-1-stable"
+    - AR_VERSION="master"
 matrix:
   allow_failures:
     - rvm: jruby-head

data/Gemfile

@@ -47,11 +47,11 @@ else
   gemspec name: 'activerecord-jdbc-adapter' # Use versiom from .gemspec
 end
 
-gem 'rake', '>= 11.1', require: nil
+gem 'rake', require: nil
 
 group :test do
-  gem 'test-unit', '~> 2.5.4', require: nil
-  gem 'test-unit-context', '>= 0.4.0', require: nil
+  gem 'test-unit', require: nil
+  gem 'test-unit-context', require: nil
   gem 'mocha', '~> 1.2', require: false # Rails has '~> 0.14'
 
   gem 'bcrypt', '~> 3.1.11', require: false
@@ -59,8 +59,8 @@ end
 
 group :rails do
   group :test do
-    gem 'minitest', '~> 5.12.2', require: nil
-    gem 'minitest-excludes', '~> 2.0.1', require: nil
+    gem 'minitest', require: nil
+    gem 'minitest-excludes', require: nil
     gem 'minitest-rg', require: nil
 
     gem 'benchmark-ips', require: nil
@@ -72,6 +72,8 @@ group :rails do
   gem 'erubis', require: nil # "~> 2.7.0"
   # NOTE: due rails/activerecord/test/cases/connection_management_test.rb
   gem 'rack', require: nil
+
+  gem 'zeitwerk'
 end
 
 group :development do

data/activerecord-jdbc-adapter.gemspec

@@ -41,7 +41,7 @@ Gem::Specification.new do |gem|
   gem.executables = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files = gem.files.grep(%r{^test/})
 
-  gem.add_dependency 'activerecord', '~> 6.1.0'
+  gem.add_dependency 'activerecord', '~> 7.0'
 
   #gem.add_development_dependency 'test-unit', '2.5.4'
   #gem.add_development_dependency 'test-unit-context', '>= 0.3.0'

data/lib/arjdbc/abstract/core.rb

@@ -34,7 +34,7 @@ module ArJdbc
         raw_connection.jdbc_connection(unwrap)
       end
 
-      protected
+      private
 
       def translate_exception_class(e, sql, binds)
         message = "#{e.class.name}: #{e.message}"
@@ -42,16 +42,19 @@ module ArJdbc
         exception = translate_exception(
           e, message: message, sql: sql, binds: binds
         )
-        exception.set_backtrace e.backtrace
+        exception.set_backtrace e.backtrace unless exception.equal?(e)
         exception
       end
 
+      Throwable = java.lang.Throwable
+      private_constant :Throwable
+
       def translate_exception(exception, message:, sql:, binds:)
         # override in derived class
 
         # we shall not translate native "Java" exceptions as they might
         # swallow an ArJdbc / driver bug into an AR::StatementInvalid !
-        return exception if exception.is_a?(Java::JavaLang::Throwable)
+        return exception if exception.is_a?(Throwable)
 
         case exception
           when SystemExit, SignalException, NoMemoryError then exception
@@ -61,14 +64,10 @@ module ArJdbc
         end
       end
 
-      def extract_raw_bind_values(binds)
-        binds.map(&:value_for_database)
-      end
-
       # this version of log() automatically fills type_casted_binds from binds if necessary
-      def log(sql, name = "SQL", binds = [], type_casted_binds = [], statement_name = nil)
+      def log(sql, name = "SQL", binds = [], type_casted_binds = [], statement_name = nil, async: false)
         if binds.any? && (type_casted_binds.nil? || type_casted_binds.empty?)
-          type_casted_binds = ->{ extract_raw_bind_values(binds) }
+          type_casted_binds = ->{ binds.map(&:value_for_database) } # extract_raw_bind_values
         end
         super
       end

data/lib/arjdbc/abstract/database_statements.rb

@@ -30,7 +30,7 @@ module ArJdbc
 
       # It appears that at this point (AR 5.0) "prepare" should only ever be true
       # if prepared statements are enabled
-      def exec_query(sql, name = nil, binds = NO_BINDS, prepare: false)
+      def exec_query(sql, name = nil, binds = NO_BINDS, prepare: false, async: false)
         if preventing_writes? && write_query?(sql)
           raise ActiveRecord::ReadOnlyError, "Write query attempted while in readonly mode: #{sql}"
         end
@@ -69,7 +69,7 @@ module ArJdbc
       end
       alias :exec_delete :exec_update
 
-      def execute(sql, name = nil)
+      def execute(sql, name = nil, async: false)
         if preventing_writes? && write_query?(sql)
           raise ActiveRecord::ReadOnlyError, "Write query attempted while in readonly mode: #{sql}"
         end
@@ -77,11 +77,11 @@ module ArJdbc
         materialize_transactions
         mark_transaction_written_if_write(sql)
 
-        log(sql, name) { @connection.execute(sql) }
+        log(sql, name, async: async) { @connection.execute(sql) }
       end
 
       # overridden to support legacy binds
-      def select_all(arel, name = nil, binds = NO_BINDS, preparable: nil)
+      def select_all(arel, name = nil, binds = NO_BINDS, preparable: nil, async: false)
         binds = convert_legacy_binds_to_attributes(binds) if binds.first.is_a?(Array)
         super
       end

data/lib/arjdbc/db2/adapter.rb

@@ -100,7 +100,7 @@ module ArJdbc
       return if @@_initialized; @@_initialized = true
 
       require 'arjdbc/util/serialized_attributes'
-      Util::SerializedAttributes.setup /blob|clob/i, 'after_save_with_db2_lob'
+      Util::SerializedAttributes.setup %r{blob|clob}i, 'after_save_with_db2_lob'
     end
 
     # @see ActiveRecord::ConnectionAdapters::JdbcAdapter#jdbc_connection_class
@@ -422,7 +422,7 @@ module ArJdbc
     def quoted_date(value)
       if value.acts_like?(:time) && value.respond_to?(:usec)
         usec = sprintf("%06d", value.usec)
-        value = ::ActiveRecord::Base.default_timezone == :utc ? value.getutc : value.getlocal
+        value = ::ActiveRecord.default_timezone == :utc ? value.getutc : value.getlocal
         "#{value.strftime("%Y-%m-%d %H:%M:%S")}.#{usec}"
       else
         super
@@ -430,7 +430,7 @@ module ArJdbc
     end if ::ActiveRecord::VERSION::MAJOR >= 3
 
     def quote_time(value)
-      value = ::ActiveRecord::Base.default_timezone == :utc ? value.getutc : value.getlocal
+      value = ::ActiveRecord.default_timezone == :utc ? value.getutc : value.getlocal
       # AS400 doesn't support date in time column
       "'#{value.strftime("%H:%M:%S")}'"
     end

data/lib/arjdbc/db2/column.rb

@@ -34,7 +34,7 @@ module ArJdbc
         return nil unless time
         time_array = [time.year, time.month, time.day, time.hour, time.min, time.sec]
         time_array[0] ||= 2000; time_array[1] ||= 1; time_array[2] ||= 1;
-        Time.send(ActiveRecord::Base.default_timezone, *time_array) rescue nil
+        Time.send(ActiveRecord.default_timezone, *time_array) rescue nil
       end
 
       # @deprecated

data/lib/arjdbc/derby/adapter.rb

@@ -197,7 +197,7 @@ module ArJdbc
     def quoted_date(value)
       if value.acts_like?(:time) && value.respond_to?(:usec)
         usec = sprintf("%06d", value.usec)
-        value = ::ActiveRecord::Base.default_timezone == :utc ? value.getutc : value.getlocal
+        value = ::ActiveRecord.default_timezone == :utc ? value.getutc : value.getlocal
         "#{value.strftime("%Y-%m-%d %H:%M:%S")}.#{usec}"
       else
         super

data/lib/arjdbc/firebird/adapter.rb

@@ -16,7 +16,7 @@ module ArJdbc
       return if @@_initialized; @@_initialized = true
 
       require 'arjdbc/util/serialized_attributes'
-      Util::SerializedAttributes.setup /blob/i
+      Util::SerializedAttributes.setup %r{blob}i
     end
 
     # @see ActiveRecord::ConnectionAdapters::JdbcAdapter#jdbc_connection_class
@@ -339,7 +339,7 @@ module ArJdbc
     def quoted_date(value)
       if value.acts_like?(:time) && value.respond_to?(:usec)
         usec = sprintf "%04d", (value.usec / 100.0).round
-        value = ::ActiveRecord::Base.default_timezone == :utc ? value.getutc : value.getlocal
+        value = ::ActiveRecord.default_timezone == :utc ? value.getutc : value.getlocal
         "#{value.strftime("%Y-%m-%d %H:%M:%S")}.#{usec}"
       else
         super

data/lib/arjdbc/hsqldb/adapter.rb

@@ -111,7 +111,7 @@ module ArJdbc
         if column_type == :time
           "'#{value.strftime("%H:%M:%S")}'"
         #elsif column_type == :timestamp # || column_type == :datetime
-          #value = ::ActiveRecord::Base.default_timezone == :utc ? value.getutc : value.getlocal
+          #value = ::ActiveRecord.default_timezone == :utc ? value.getutc : value.getlocal
           #"'#{value.strftime("%Y-%m-%d %H:%M:%S")}.#{sprintf("%06d", value.usec)}'"
         else
           super
@@ -127,7 +127,7 @@ module ArJdbc
     def quoted_date(value)
       if value.acts_like?(:time) && value.respond_to?(:usec)
         usec = sprintf("%06d", value.usec)
-        value = ::ActiveRecord::Base.default_timezone == :utc ? value.getutc : value.getlocal
+        value = ::ActiveRecord.default_timezone == :utc ? value.getutc : value.getlocal
         "#{value.strftime("%Y-%m-%d %H:%M:%S")}.#{usec}"
       else
         super

data/lib/arjdbc/jdbc/adapter.rb

@@ -431,12 +431,12 @@ module ActiveRecord
       private
 
       # Helper useful during {#quote} since AREL might pass in it's literals
-      # to be quoted, fixed since AREL 4.0.0.beta1 : http://git.io/7gyTig
+      # to be quoted, fixed since AREL 4.0.0.beta1 : https://github.com/rails/arel/commit/9c514f3
       def sql_literal?(value); ::Arel::Nodes::SqlLiteral === value; end
 
-      # Helper to get local/UTC time (based on `ActiveRecord::Base.default_timezone`).
+      # Helper to get local/UTC time (based on `ActiveRecord::default_timezone`).
       def get_time(value)
-        get = ::ActiveRecord::Base.default_timezone == :utc ? :getutc : :getlocal
+        get = ::ActiveRecord.default_timezone == :utc ? :getutc : :getlocal
         value.respond_to?(get) ? value.send(get) : value
       end
 

data/lib/arjdbc/jdbc/type_cast.rb

@@ -130,9 +130,9 @@ module ActiveRecord::ConnectionAdapters
             return nil unless time
 
             time -= offset
-            ActiveRecord::Base.default_timezone == :utc ? time : time.getlocal
+            ActiveRecord.default_timezone == :utc ? time : time.getlocal
           else
-            timezone = ActiveRecord::Base.default_timezone
+            timezone = ActiveRecord.default_timezone
             Time.public_send(timezone, year, mon, mday, hour, min, sec, microsec) rescue nil
           end
         end

data/lib/arjdbc/mysql/adapter.rb

@@ -107,7 +107,8 @@ module ActiveRecord
 
       # Reloading the type map in abstract/statement_cache.rb blows up postgres
       def clear_cache!
-        reload_type_map
+        # FIXME: This seems to have disappeared in Rails 7?
+        # reload_type_map
         super
       end
 

data/lib/arjdbc/oracle/adapter.rb

@@ -40,7 +40,7 @@ module ArJdbc
       return if @@_initialized; @@_initialized = true
 
       require 'arjdbc/util/serialized_attributes'
-      Util::SerializedAttributes.setup /LOB\(|LOB$/i, 'after_save_with_oracle_lob'
+      Util::SerializedAttributes.setup %r{LOB\(|LOB$}i, 'after_save_with_oracle_lob'
 
       unless ActiveRecord::ConnectionAdapters::AbstractAdapter.
           instance_methods(false).detect { |m| m.to_s == "prefetch_primary_key?" }

data/lib/arjdbc/postgresql/adapter.rb

@@ -81,7 +81,7 @@ module ArJdbc
       # If using Active Record's time zone support configure the connection to return
       # TIMESTAMP WITH ZONE types in UTC.
       # (SET TIME ZONE does not use an equals sign like other SET variables)
-      if ActiveRecord::Base.default_timezone == :utc
+      if ActiveRecord.default_timezone == :utc
         execute("SET time zone 'UTC'", 'SCHEMA')
       elsif tz = local_tz
         execute("SET time zone '#{tz}'", 'SCHEMA')

data/lib/arjdbc/sqlite3/adapter.rb

@@ -10,6 +10,7 @@ require "active_record/connection_adapters/abstract_adapter"
 require "active_record/connection_adapters/statement_pool"
 require "active_record/connection_adapters/sqlite3/explain_pretty_printer"
 require "active_record/connection_adapters/sqlite3/quoting"
+require "active_record/connection_adapters/sqlite3/database_statements"
 require "active_record/connection_adapters/sqlite3/schema_creation"
 require "active_record/connection_adapters/sqlite3/schema_definitions"
 require "active_record/connection_adapters/sqlite3/schema_dumper"
@@ -64,6 +65,7 @@ module ArJdbc
     # DIFFERENCE: FQN
     include ::ActiveRecord::ConnectionAdapters::SQLite3::Quoting
     include ::ActiveRecord::ConnectionAdapters::SQLite3::SchemaStatements
+    include ::ActiveRecord::ConnectionAdapters::SQLite3::DatabaseStatements
 
     NATIVE_DATABASE_TYPES = {
         primary_key:  "integer PRIMARY KEY AUTOINCREMENT NOT NULL",
@@ -79,15 +81,30 @@ module ArJdbc
         boolean:      { name: "boolean" },
         json:         { name: "json" },
     }
-
-    # DIFFERENCE: class_attribute in original adapter is moved down to our section which is a class
-    #  since we cannot define it here in the module (original source this is a class).
+    
+    class StatementPool < ConnectionAdapters::StatementPool # :nodoc:
+      private
+      def dealloc(stmt)
+        stmt.close unless stmt.closed?
+      end
+    end
 
     def initialize(connection, logger, connection_options, config)
+      @memory_database = config[:database] == ":memory:"
       super(connection, logger, config)
       configure_connection
     end
 
+    def self.database_exists?(config)
+      config = config.symbolize_keys
+      if config[:database] == ":memory:"
+        true
+      else
+        database_file = defined?(Rails.root) ? File.expand_path(config[:database], Rails.root) : config[:database]
+        File.exist?(database_file)
+      end
+    end
+
     def supports_ddl_transactions?
       true
     end
@@ -101,7 +118,7 @@ module ArJdbc
     end
 
     def supports_partial_index?
-      database_version >= "3.9.0"
+      true
     end
 
     def supports_expression_index?
@@ -144,6 +161,25 @@ module ArJdbc
     alias supports_insert_conflict_target? supports_insert_on_conflict?
 
     # DIFFERENCE: active?, reconnect!, disconnect! handles by arjdbc core
+    def supports_concurrent_connections?
+      !@memory_database
+    end
+
+    def active?
+      !@raw_connection.closed?
+    end
+
+    def reconnect!
+      super
+      connect if @connection.closed?
+    end
+
+    # Disconnects from the database if already connected. Otherwise, this
+    # method does nothing.
+    def disconnect!
+      super
+      @connection.close rescue nil
+    end
 
     def supports_index_sort_order?
       true
@@ -182,48 +218,8 @@ module ArJdbc
       end
     end
 
-    #--
-    # DATABASE STATEMENTS ======================================
-    #++
-
-    READ_QUERY = ActiveRecord::ConnectionAdapters::AbstractAdapter.build_read_query_regexp(
-      :pragma
-    ) # :nodoc:
-    private_constant :READ_QUERY
-
-    def write_query?(sql) # :nodoc:
-      !READ_QUERY.match?(sql)
-    end
-
-    def explain(arel, binds = [])
-      sql = "EXPLAIN QUERY PLAN #{to_sql(arel, binds)}"
-      # DIFFERENCE: FQN
-      ::ActiveRecord::ConnectionAdapters::SQLite3::ExplainPrettyPrinter.new.pp(exec_query(sql, "EXPLAIN", []))
-    end
-
-    # DIFFERENCE: implemented in ArJdbc::Abstract::DatabaseStatements
-    #def exec_query(sql, name = nil, binds = [], prepare: false)
-
-    # DIFFERENCE: implemented in ArJdbc::Abstract::DatabaseStatements
-    #def exec_delete(sql, name = "SQL", binds = [])
-
-    def last_inserted_id(result)
-      @connection.last_insert_row_id
-    end
-
-    # DIFFERENCE: implemented in ArJdbc::Abstract::DatabaseStatements
-    #def execute(sql, name = nil) #:nodoc:
-
-    def begin_db_transaction #:nodoc:
-      log("begin transaction", 'TRANSACTION') { @connection.transaction }
-    end
-
-    def commit_db_transaction #:nodoc:
-      log("commit transaction", 'TRANSACTION') { @connection.commit }
-    end
-
-    def exec_rollback_db_transaction #:nodoc:
-      log("rollback transaction", 'TRANSACTION') { @connection.rollback }
+    def all_foreign_keys_valid? # :nodoc:
+      execute("PRAGMA foreign_key_check").blank?
     end
 
     # SCHEMA STATEMENTS ========================================
@@ -233,14 +229,15 @@ module ArJdbc
       pks.sort_by { |f| f["pk"] }.map { |f| f["name"] }
     end
 
-      def remove_index(table_name, column_name = nil, **options) # :nodoc:
-        return if options[:if_exists] && !index_exists?(table_name, column_name, **options)
+    def remove_index(table_name, column_name = nil, **options) # :nodoc:
+      return if options[:if_exists] && !index_exists?(table_name, column_name, **options)
 
       index_name = index_name_for_remove(table_name, column_name, options)
 
       exec_query "DROP INDEX #{quote_column_name(index_name)}"
     end
 
+    
     # Renames a table.
     #
     # Example:
@@ -265,9 +262,17 @@ module ArJdbc
     def remove_column(table_name, column_name, type = nil, **options) #:nodoc:
       alter_table(table_name) do |definition|
         definition.remove_column column_name
-        definition.foreign_keys.delete_if do |_, fk_options|
-          fk_options[:column] == column_name.to_s
+        definition.foreign_keys.delete_if { |fk| fk.column == column_name.to_s }
+      end
+    end
+
+    def remove_columns(table_name, *column_names, type: nil, **options) # :nodoc:
+      alter_table(table_name) do |definition|
+        column_names.each do |column_name|
+          definition.remove_column column_name
         end
+        column_names = column_names.map(&:to_s)
+        definition.foreign_keys.delete_if { |fk| column_names.include?(fk.column) }
       end
     end
 
@@ -291,8 +296,8 @@ module ArJdbc
     def change_column(table_name, column_name, type, **options) #:nodoc:
       alter_table(table_name) do |definition|
         definition[column_name].instance_eval do
-          self.type    = type
-            self.options.merge!(options)
+          self.type = aliased_types(type.to_s, type)
+          self.options.merge!(options)
         end
       end
     end
@@ -322,18 +327,6 @@ module ArJdbc
       end
     end
 
-    def insert_fixtures_set(fixture_set, tables_to_delete = [])
-      disable_referential_integrity do
-        transaction(requires_new: true) do
-          tables_to_delete.each { |table| delete "DELETE FROM #{quote_table_name(table)}", "Fixture Delete" }
-
-          fixture_set.each do |table_name, rows|
-            rows.each { |row| insert_fixture(row, table_name) }
-          end
-        end
-      end
-    end
-
     def build_insert_sql(insert) # :nodoc:
       sql = +"INSERT #{insert.into} #{insert.values_list}"
 
@@ -341,23 +334,23 @@ module ArJdbc
         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(",")
+        if insert.raw_update_sql?
+          sql << insert.raw_update_sql
+        else
+          sql << insert.touch_model_timestamps_unless { |column| "#{column} IS excluded.#{column}" }
+          sql << insert.updatable_columns.map { |column| "#{column}=excluded.#{column}" }.join(",")
+        end
       end
 
       sql
     end
 
-    def shared_cache?
-      config[:properties] && config[:properties][:shared_cache] == true
+    def shared_cache? # :nodoc:
+      @config.fetch(:flags, 0).anybits?(::SQLite3::Constants::Open::SHAREDCACHE)
     end
 
     def get_database_version # :nodoc:
-      SQLite3Adapter::Version.new(query_value("SELECT sqlite_version(*)"))
-    end
-
-    def build_truncate_statement(table_name)
-      "DELETE FROM #{quote_table_name(table_name)}"
+      SQLite3Adapter::Version.new(query_value("SELECT sqlite_version(*)", "SCHEMA"))
     end
 
     def check_version
@@ -380,6 +373,34 @@ module ArJdbc
     end
     alias column_definitions table_structure
 
+    def extract_value_from_default(default)
+      case default
+      when /^null$/i
+        nil
+        # Quoted types
+      when /^'(.*)'$/m
+        $1.gsub("''", "'")
+        # Quoted types
+      when /^"(.*)"$/m
+        $1.gsub('""', '"')
+        # Numeric types
+      when /\A-?\d+(\.\d*)?\z/
+        $&
+      else
+        # Anything else is blank or some function
+        # and we can't know the value of that, so return nil.
+        nil
+      end
+    end
+
+    def extract_default_function(default_value, default)
+      default if has_default_function?(default_value, default)
+    end
+
+    def has_default_function?(default_value, default)
+      !default_value && %r{\w+\(.*\)|CURRENT_TIME|CURRENT_DATE|CURRENT_TIMESTAMP}.match?(default)
+    end
+
     # See: https://www.sqlite.org/lang_altertable.html
     # SQLite has an additional restriction on the ALTER TABLE statement
     def invalid_alter_table_type?(type, options)
@@ -440,8 +461,13 @@ module ArJdbc
              options[:rename][column.name.to_sym] ||
              column.name) : column.name
 
+          if column.has_default?
+            type = lookup_cast_type_from_column(column)
+            default = type.deserialize(column.default)
+          end
+
           @definition.column(column_name, column.type,
-            limit: column.limit, default: column.default,
+            limit: column.limit, default: default,
             precision: column.precision, scale: column.scale,
             null: column.null, collation: column.collation,
             primary_key: column_name == from_primary_key
@@ -459,9 +485,6 @@ module ArJdbc
     def copy_table_indexes(from, to, rename = {})
       indexes(from).each do |index|
         name = index.name
-        # indexes sqlite creates for internal use start with `sqlite_` and
-        # don't need to be copied
-        next if name.start_with?("sqlite_")
         if to == "a#{from}"
           name = "t#{name}"
         elsif from == "a#{to}"
@@ -481,6 +504,7 @@ module ArJdbc
           options = { name: name.gsub(/(^|_)(#{from})_/, "\\1#{to}_"), internal: true }
           options[:unique] = true if index.unique
           options[:where] = index.where if index.where
+          options[:order] = index.orders if index.orders
           add_index(to, columns, **options)
         end
       end
@@ -500,20 +524,22 @@ module ArJdbc
     end
 
     def translate_exception(exception, message:, sql:, binds:)
-      case exception.message
       # SQLite 3.8.2 returns a newly formatted error message:
       #   UNIQUE constraint failed: *table_name*.*column_name*
       # Older versions of SQLite return:
       #   column *column_name* is not unique
-      when /column(s)? .* (is|are) not unique/, /UNIQUE constraint failed: .*/
+      if exception.message.match?(/(column(s)? .* (is|are) not unique|UNIQUE constraint failed: .*)/i)
         # DIFFERENCE: FQN
         ::ActiveRecord::RecordNotUnique.new(message, sql: sql, binds: binds)
-      when /.* may not be NULL/, /NOT NULL constraint failed: .*/
+      elsif exception.message.match?(/(.* may not be NULL|NOT NULL constraint failed: .*)/i)
         # DIFFERENCE: FQN
         ::ActiveRecord::NotNullViolation.new(message, sql: sql, binds: binds)
-      when /FOREIGN KEY constraint failed/i
+      elsif exception.message.match?(/FOREIGN KEY constraint failed/i)
         # DIFFERENCE: FQN
         ::ActiveRecord::InvalidForeignKey.new(message, sql: sql, binds: binds)
+      elsif exception.message.match?(/called on a closed database/i)
+        # DIFFERENCE: FQN
+        ::ActiveRecord::ConnectionNotEstablished.new(exception)
       else
         super
       end
@@ -533,12 +559,12 @@ module ArJdbc
       # Result will have following sample string
       # CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
       #                       "password_digest" varchar COLLATE "NOCASE");
-      result = exec_query(sql, "SCHEMA").first
+      result = query_value(sql, "SCHEMA")
 
       if result
         # Splitting with left parentheses and discarding the first part will return all
         # columns separated with comma(,).
-        columns_string = result["sql"].split("(", 2).last
+        columns_string = result.split("(", 2).last
 
         columns_string.split(",").each do |column_string|
           # This regex will match the column name and collation type and will save
@@ -564,7 +590,21 @@ module ArJdbc
       Arel::Visitors::SQLite.new(self)
     end
 
+    def build_statement_pool
+      StatementPool.new(self.class.type_cast_config_to_integer(@config[:statement_limit]))
+    end
+
+    def connect
+      @connection = ::SQLite3::Database.new(
+        @config[:database].to_s,
+        @config.merge(results_as_hash: true)
+      )
+    end
+
     def configure_connection
+      # FIXME: missing from adapter
+#      @connection.busy_timeout(self.class.type_cast_config_to_integer(@config[:timeout])) if @config[:timeout]
+
       execute("PRAGMA foreign_keys = ON", "SCHEMA")
     end
 
@@ -720,11 +760,15 @@ module ActiveRecord::ConnectionAdapters
 
     # because the JDBC driver doesn't like multiple SQL statements in one JDBC statement
     def combine_multi_statements(total_sql)
-      if total_sql.length == 1
-        total_sql.first
-      else
-        total_sql
-      end
+      total_sql
+    end
+
+    # combine
+    def write_query?(sql) # :nodoc:
+      return sql.any? { |stmt| super(stmt) } if sql.kind_of? Array
+      !READ_QUERY.match?(sql)
+    rescue ArgumentError # Invalid encoding
+      !READ_QUERY.match?(sql.b)
     end
 
     def initialize_type_map(m = type_map)

data/lib/arjdbc/util/table_copier.rb

@@ -4,7 +4,8 @@ module ArJdbc
   module Util
     module TableCopier
 
-      # taken from SQLite adapter, code loosely based on http://git.io/P7tFQA
+      # taken from SQLite adapter, code loosely based on
+      # https://github.com/rails/rails/blob/d3e5118/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
 
       # Performs changes for table by first copying (and preserving contents)
       # into another (temporary) table, than alters and copies all data back.

data/lib/arjdbc/version.rb

@@ -1,3 +1,3 @@
 module ArJdbc
-  VERSION = '61.2'
+  VERSION = '70.0'
 end

data/src/java/arjdbc/jdbc/RubyJdbcConnection.java

@@ -720,6 +720,21 @@ public class RubyJdbcConnection extends RubyObject {
         }
     }
 
+    @JRubyMethod(name = "closed?")
+    public IRubyObject closed_p(ThreadContext context) {
+        try {
+            final Connection connection = getConnectionInternal(false);
+
+            if (connection == null) return context.fals;
+
+            // NOTE: isClosed method generally cannot be called to determine
+            // whether a connection to a database is valid or invalid ...
+            return context.runtime.newBoolean(connection.isClosed());
+        } catch (SQLException e) {
+            return handleException(context, e);
+        }
+    }
+
     @JRubyMethod(name = "close")
     public IRubyObject close(final ThreadContext context) {
         final Connection connection = getConnection(false);
@@ -2633,8 +2648,8 @@ public class RubyJdbcConnection extends RubyObject {
     }
 
     private String default_timezone(final ThreadContext context) {
-        final RubyClass base = getBase(context.runtime);
-        return default_timezone.call(context, base, base).asJavaString(); // :utc (or :local)
+        final RubyModule activeRecord = ActiveRecord(context);
+        return default_timezone.call(context, activeRecord, activeRecord).asJavaString(); // :utc (or :local)
     }
 
     // ActiveRecord::Base.default_timezone

data/src/java/arjdbc/sqlite3/SQLite3RubyJdbcConnection.java

@@ -402,6 +402,11 @@ public class SQLite3RubyJdbcConnection extends RubyJdbcConnection {
         finally { close(statement); }
     }
 
+    @JRubyMethod
+    public IRubyObject filename(ThreadContext context) {
+        return getConfigValue(context, "database");
+    }
+
     @Override
     @JRubyMethod(name = "rollback_savepoint", required = 1)
     public IRubyObject rollback_savepoint(final ThreadContext context, final IRubyObject name) {
@@ -460,6 +465,34 @@ public class SQLite3RubyJdbcConnection extends RubyJdbcConnection {
         return context.runtime.newBoolean(connection.isReadOnly());
     }
 
+    // note: sqlite3 cext uses this same method but we do not combine all our statements
+    // into a single ; delimited string but leave it as an array of statements.  This is
+    // because the JDBC way of handling batches is to use addBatch().
+    @JRubyMethod(name = "execute_batch2")
+    public IRubyObject execute_batch2(ThreadContext context, IRubyObject statementsArg) {
+        // Assume we will only call this with an array.
+        final RubyArray statements = (RubyArray) statementsArg;
+        return withConnection(context, connection -> {
+            Statement statement = null;
+            try {
+                statement = createStatement(context, connection);
+
+                int length = statements.getLength();
+                for (int i = 0; i < length; i++) {
+                    statement.addBatch(sqlString(statements.eltOk(i)));
+                }
+                statement.executeBatch();
+                return context.nil;
+            } catch (final SQLException e) {
+                // Generate list semicolon list of statements which should match AR error formatting more.
+                debugErrorSQL(context, sqlString(statements.join(context, context.runtime.newString(";\n"))));
+                throw e;
+            } finally {
+                close(statement);
+            }
+        });
+    }
+
     @Override
     protected void setDecimalParameter(final ThreadContext context,
         final Connection connection, final PreparedStatement statement,

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbc-adapter
 version: !ruby/object:Gem::Version
-  version: '61.2'
+  version: '70.0'
 platform: java
 authors:
 - Nick Sieger, Ola Bini, Karol Bucek and JRuby contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-29 00:00:00.000000000 Z
+date: 2022-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: '7.0'
   name: activerecord
   prerelease: false
   type: :runtime
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: '7.0'
 description: 'AR-JDBC is a database adapter for Rails'' ActiveRecord component designed
   to be used with JRuby built upon Java''s JDBC API for database access. Provides
   (ActiveRecord) built-in adapters: MySQL,  PostgreSQL, SQLite3, and SQLServer.'
@@ -231,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.29
+rubygems_version: 3.3.25
 signing_key:
 specification_version: 4
 summary: JDBC adapter for ActiveRecord, for use within JRuby on Rails.