activerecord-jdbc-adapter 70.2-java → 71.0-java

data/lib/arjdbc/sqlite3/column.rb

@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+module ActiveRecord::ConnectionAdapters
+  class SQLite3Column < JdbcColumn
+
+    attr_reader :rowid
+    
+    def initialize(name, default, sql_type_metadata = nil, null = true, default_function = nil, collation: nil, comment: nil, auto_increment: nil, rowid: false, **)
+      super
+      @auto_increment = auto_increment
+      @default = nil if default =~ /NULL/
+      @rowid = rowid
+    end
+
+    def self.string_to_binary(value)
+      value
+    end
+
+    def self.binary_to_string(value)
+      if value.respond_to?(:encoding) && value.encoding != Encoding::ASCII_8BIT
+        value = value.force_encoding(Encoding::ASCII_8BIT)
+      end
+      value
+    end
+
+    # @override {ActiveRecord::ConnectionAdapters::JdbcColumn#default_value}
+    def default_value(value)
+      # JDBC returns column default strings with actual single quotes :
+      return $1 if value =~ /^'(.*)'$/
+
+      value
+    end
+
+    def auto_increment?
+      @auto_increment
+    end
+
+    def auto_incremented_by_db?
+      auto_increment? || rowid
+    end
+
+    def init_with(coder)
+      @auto_increment = coder["auto_increment"]
+      super
+    end
+
+    def encode_with(coder)
+      coder["auto_increment"] = @auto_increment
+      super
+    end
+
+    def ==(other)
+      other.is_a?(Column) &&
+        super &&
+        auto_increment? == other.auto_increment?
+    end
+    alias :eql? :==
+
+    def hash
+      Column.hash ^
+        super.hash ^
+        auto_increment?.hash ^
+        rowid.hash
+    end
+
+    # @override {ActiveRecord::ConnectionAdapters::Column#type_cast}
+    def type_cast(value)
+      return nil if value.nil?
+      case type
+        when :string then value
+        when :primary_key
+          value.respond_to?(:to_i) ? value.to_i : ( value ? 1 : 0 )
+        when :float    then value.to_f
+        when :decimal  then self.class.value_to_decimal(value)
+        when :boolean  then self.class.value_to_boolean(value)
+        else super
+      end
+    end
+
+    private
+
+    # @override {ActiveRecord::ConnectionAdapters::Column#extract_limit}
+    def extract_limit(sql_type)
+      return nil if sql_type =~ /^(real)\(\d+/i
+      super
+    end
+
+    def extract_precision(sql_type)
+      case sql_type
+        when /^(real)\((\d+)(,\d+)?\)/i then $2.to_i
+        else super
+      end
+    end
+
+    def extract_scale(sql_type)
+      case sql_type
+        when /^(real)\((\d+)\)/i then 0
+        when /^(real)\((\d+)(,(\d+))\)/i then $4.to_i
+        else super
+      end
+    end
+  end
+end

data/lib/arjdbc/sqlite3/connection_methods.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 ArJdbc::ConnectionMethods.module_eval do
   def sqlite3_connection(config)
+    raise ArgumentError, 'Configuration must not be empty' if config.blank?
+    
     config = config.deep_dup
     config[:adapter_spec] ||= ::ArJdbc::SQLite3
     config[:adapter_class] = ActiveRecord::ConnectionAdapters::SQLite3Adapter unless config.key?(:adapter_class)
@@ -18,7 +20,7 @@ ArJdbc::ConnectionMethods.module_eval do
       parse_sqlite3_config!(config)
     rescue Errno::ENOENT => error
       if error.message.include?('No such file or directory')
-        raise ActiveRecord::NoDatabaseError
+        raise ActiveRecord::NoDatabaseError.new(connection_pool: ActiveRecord::ConnectionAdapters::NullPool.new)
       else
         raise
       end
@@ -50,7 +52,10 @@ ArJdbc::ConnectionMethods.module_eval do
 
     timeout = config[:timeout]
     if timeout && timeout.to_s !~ /\A\d+\Z/
-      raise TypeError.new "Timeout must be nil or a number (got: #{timeout})."
+      raise ActiveRecord::StatementInvalid.new(
+        "TypeError: Timeout must be nil or a number (got: #{timeout}).",
+        connection_pool: ActiveRecord::ConnectionAdapters::NullPool.new
+      )
     end
 
     options = config[:properties]

data/lib/arjdbc/version.rb

@@ -1,3 +1,3 @@
 module ArJdbc
-  VERSION = '70.2'
+  VERSION = '71.0'
 end

data/rakelib/02-test.rake

@@ -40,7 +40,7 @@ def test_task_for(adapter, options = {})
       test_task.libs.push *FileList["activerecord-jdbc#{adapter}*/lib"]
     end
     test_task.libs << 'test'
-    test_task.options = '--use-color=t'
+    test_task.options = '--use-color=t --progress-style=mark'
     test_task.verbose = true if $VERBOSE
     yield(test_task) if block_given?
   end

data/rakelib/rails.rake

@@ -34,6 +34,7 @@ namespace :rails do
           File.join(root_dir, 'lib'),
           File.join(root_dir, driver, 'lib'),
           File.join(root_dir, 'test/rails'),
+          File.join(root_dir, 'jdbc-sqlite3', 'lib'),  # Added for connection management tests which hardcode sqlite3
           ar_test_dir
       ]
 
@@ -51,6 +52,7 @@ namespace :rails do
       ruby_opts_string += " -C \"#{ar_path}\""
       ruby_opts_string += " -rbundler/setup"
       ruby_opts_string += " -rminitest -rminitest/excludes" unless ENV['NO_EXCLUDES'].eql?('true')
+      ruby_opts_string += " -rmonkey_patches"
       file_list = ENV["TEST"] ? FileList[ ENV["TEST"].split(',') ] : test_files_finder.call
       file_list_string = file_list.map { |fn| "\"#{fn}\"" }.join(' ')
       # test_loader_code = "-e \"ARGV.each{|f| require f}\"" # :direct

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

@@ -793,7 +793,8 @@ public class RubyJdbcConnection extends RubyObject {
                         // Unfortunately the result set gets closed when getMoreResults()
                         // is called, so we have to process the result sets as we get them
                         // this shouldn't be an issue in most cases since we're only getting 1 result set anyways
-                        result = mapExecuteResult(context, connection, resultSet);
+                        //result = mapExecuteResult(context, connection, resultSet);
+                        result = mapToRawResult(context, connection, resultSet, false);
                         resultSet.close();
                     } else {
                         result = context.runtime.newFixnum(updateCount);
@@ -2726,8 +2727,9 @@ public class RubyJdbcConnection extends RubyObject {
             statement.setDouble(index, ((RubyNumeric) value).getDoubleValue());
         }
         else { // e.g. `BigDecimal '42.00000000000000000001'`
+            Ruby runtime = context.runtime;
             statement.setBigDecimal(index,
-                    RubyBigDecimal.newInstance(context, context.runtime.getModule("BigDecimal"), value, RubyFixnum.newFixnum(context.runtime, Integer.MAX_VALUE)).getValue());
+                    RubyBigDecimal.newInstance(context, runtime.getModule("BigDecimal"), value, RubyFixnum.zero(runtime)).getValue());
         }
     }
 

data/src/java/arjdbc/mysql/MySQLRubyJdbcConnection.java

@@ -119,6 +119,17 @@ public class MySQLRubyJdbcConnection extends RubyJdbcConnection {
         return driverWrapper;
     }
 
+    @JRubyMethod(name = "ping")
+    public RubyBoolean db_ping(final ThreadContext context) {
+        final Connection connection = getConnection(true);
+        if (connection == null) return context.fals;
+
+        // NOTE: It seems only `connection.isValid(aliveTimeout)` is needed
+        // for JDBC 4.0 and up. https://jira.mariadb.org/browse/CONJ-51
+
+        return context.runtime.newBoolean(isConnectionValid(context, connection));
+    }
+
     private static transient Class MYSQL_CONNECTION;
     private static transient Boolean MYSQL_CONNECTION_FOUND;
 

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

@@ -511,7 +511,8 @@ public class SQLite3RubyJdbcConnection extends RubyJdbcConnection {
             statement.setDouble(index, ((RubyNumeric) value).getDoubleValue());
         }
         else { // e.g. `BigDecimal '42.00000000000000000001'`
-            RubyBigDecimal val = RubyBigDecimal.newInstance(context, context.runtime.getModule("BigDecimal"), value, RubyFixnum.newFixnum(context.runtime, Integer.MAX_VALUE));
+            Ruby runtime = context.runtime;
+            RubyBigDecimal val = RubyBigDecimal.newInstance(context, runtime.getModule("BigDecimal"), value, RubyFixnum.zero(runtime));
             statement.setString(index, val.getValue().toString());
         }
     }

metadata

@@ -1,32 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbc-adapter
 version: !ruby/object:Gem::Version
-  version: '70.2'
+  version: '71.0'
 platform: java
 authors:
 - Nick Sieger, Ola Bini, Karol Bucek and JRuby contributors
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-09 00:00:00.000000000 Z
+date: 2025-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
-  name: activerecord
+        version: 7.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: 7.1.3
 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.'
+  (ActiveRecord) built-in adapters: MySQL,  PostgreSQL, and SQLite3.'
 email:
 - nick@nicksieger.com
 - ola.bini@gmail.com
@@ -69,6 +68,7 @@ files:
 - lib/arjdbc/abstract/connection_management.rb
 - lib/arjdbc/abstract/core.rb
 - lib/arjdbc/abstract/database_statements.rb
+- lib/arjdbc/abstract/relation_query_attribute_monkey_patch.rb
 - lib/arjdbc/abstract/statement_cache.rb
 - lib/arjdbc/abstract/transaction_support.rb
 - lib/arjdbc/discover.rb
@@ -110,11 +110,14 @@ files:
 - lib/arjdbc/postgresql/base/pgconn.rb
 - lib/arjdbc/postgresql/column.rb
 - lib/arjdbc/postgresql/connection_methods.rb
+- lib/arjdbc/postgresql/database_statements.rb
 - lib/arjdbc/postgresql/name.rb
 - lib/arjdbc/postgresql/oid_types.rb
+- lib/arjdbc/postgresql/schema_statements.rb
 - lib/arjdbc/railtie.rb
 - lib/arjdbc/sqlite3.rb
 - lib/arjdbc/sqlite3/adapter.rb
+- lib/arjdbc/sqlite3/column.rb
 - lib/arjdbc/sqlite3/connection_methods.rb
 - lib/arjdbc/tasks.rb
 - lib/arjdbc/tasks/database_tasks.rb
@@ -181,7 +184,6 @@ homepage: https://github.com/jruby/activerecord-jdbc-adapter
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message:
 rdoc_options:
 - "--main"
 - README.md
@@ -198,8 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key:
+rubygems_version: 3.6.0.dev
 specification_version: 4
 summary: JDBC adapter for ActiveRecord, for use within JRuby on Rails.
 test_files: []