Merge pull request #1112 from headius/rails7

Switch to jruby-head and rails 7.0

Author: headius

.github/workflows/ruby.yml

@@ -24,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']
 
@@ -76,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:
@@ -126,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 }}
@@ -158,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']
@@ -203,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']
@@ -250,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']
 

Gemfile

@@ -47,20 +47,20 @@ 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
 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

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.2.4'
 
   #gem.add_development_dependency 'test-unit', '2.5.4'
   #gem.add_development_dependency 'test-unit-context', '>= 0.3.0'

lib/arjdbc/abstract/database_statements.rb

@@ -69,19 +69,19 @@ def exec_update(sql, name = nil, binds = NO_BINDS)
       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
 
         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

lib/arjdbc/sqlite3/adapter.rb

@@ -79,9 +79,15 @@ module SQLite3
         boolean:      { name: "boolean" },
         json:         { name: "json" },
     }
+    
+    class StatementPool < ConnectionAdapters::StatementPool # :nodoc:
+      alias reset clear
 
-    # 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).
+      private
+      def dealloc(stmt)
+        stmt.close unless stmt.closed?
+      end
+    end
 
     def initialize(connection, logger, connection_options, config)
       super(connection, logger, config)
@@ -101,7 +107,7 @@ def supports_transaction_isolation?
     end
 
     def supports_partial_index?
-      database_version >= "3.9.0"
+      true
     end
 
     def supports_expression_index?
@@ -144,6 +150,34 @@ def supports_insert_on_conflict?
     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!(restore_transactions: false)
+      @lock.synchronize do
+        if active?
+          @connection.rollback rescue nil
+        else
+          connect
+        end
+
+        super
+      end
+    end
+    alias :reset! :reconnect!
+
+    # 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
@@ -233,8 +267,8 @@ def primary_keys(table_name) # :nodoc:
       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)
 
@@ -271,6 +305,16 @@ def remove_column(table_name, column_name, type = nil, **options) #:nodoc:
       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
+
     def change_column_default(table_name, column_name, default_or_changes) #:nodoc:
       default = extract_new_default_value(default_or_changes)
 
@@ -380,6 +424,34 @@ def table_structure(table_name)
     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)
@@ -564,6 +636,17 @@ def arel_visitor
       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
       execute("PRAGMA foreign_keys = ON", "SCHEMA")
     end