activerecord-jdbc-adapter 72.0-java → 80.0.pre1-java

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

@@ -60,6 +60,11 @@ import arjdbc.jdbc.RubyJdbcConnection;
 
 import static arjdbc.util.StringHelper.newDefaultInternalString;
 import static arjdbc.util.StringHelper.newString;
+import static org.jruby.api.Access.getModule;
+import static org.jruby.api.Convert.asFixnum;
+import static org.jruby.api.Create.allocArray;
+import static org.jruby.api.Create.newArray;
+import static org.jruby.api.Create.newEmptyArray;
 
 /**
  *
@@ -77,17 +82,19 @@ public class SQLite3RubyJdbcConnection extends RubyJdbcConnection {
         TIMESTAMP_FORMAT = runtime.newString("%F %T.%6N");
     }
 
-    public static RubyClass createSQLite3JdbcConnectionClass(Ruby runtime, RubyClass jdbcConnection) {
-        final RubyClass clazz = getConnectionAdapters(runtime). // ActiveRecord::ConnectionAdapters
-            defineClassUnder("SQLite3JdbcConnection", jdbcConnection, ALLOCATOR);
-        clazz.defineAnnotatedMethods( SQLite3RubyJdbcConnection.class );
-        getConnectionAdapters(runtime).setConstant("Sqlite3JdbcConnection", clazz); // backwards-compat
+    public static RubyClass createSQLite3JdbcConnectionClass(ThreadContext context, RubyClass jdbcConnection) {
+        var connectionAdapters = getConnectionAdapters(context); // ActiveRecord::ConnectionAdapters
+        final RubyClass clazz = connectionAdapters.
+                defineClassUnder(context, "SQLite3JdbcConnection", jdbcConnection, ALLOCATOR).
+                defineMethods(context, SQLite3RubyJdbcConnection.class);
+        connectionAdapters.setConstant(context, "Sqlite3JdbcConnection", clazz); // backwards-compat
         return clazz;
     }
 
     public static RubyClass load(final Ruby runtime) {
-        RubyClass jdbcConnection = getJdbcConnection(runtime);
-        return createSQLite3JdbcConnectionClass(runtime, jdbcConnection);
+        var context = runtime.getCurrentContext();
+        RubyClass jdbcConnection = getJdbcConnection(context);
+        return createSQLite3JdbcConnectionClass(context, jdbcConnection);
     }
 
     protected static final ObjectAllocator ALLOCATOR = new ObjectAllocator() {
@@ -140,7 +147,7 @@ public class SQLite3RubyJdbcConnection extends RubyJdbcConnection {
                 //return mapGeneratedKeys(context.getRuntime(), connection, statement, true);
                 // but we should assume SQLite JDBC will prefer sane API usage eventually :
                 genKeys = statement.executeQuery("SELECT last_insert_rowid()");
-                return doMapGeneratedKeys(context.runtime, genKeys, true);
+                return doMapGeneratedKeys(context, genKeys, (Boolean) true);
             }
             catch (final SQLException e) {
                 debugMessage(context.runtime, "failed to get generated keys: ", e);
@@ -182,8 +189,7 @@ public class SQLite3RubyJdbcConnection extends RubyJdbcConnection {
         final String schemaName = schema;
         // return super.indexes(context, tableName, name, schemaName);
         return withConnection(context, (Callable<IRubyObject>) connection -> {
-            final Ruby runtime = context.runtime;
-            final RubyClass IndexDefinition = getIndexDefinition(runtime);
+            final RubyClass IndexDefinition = getIndexDefinition(context);
 
             final TableName table1 = extractTableName(connection, null, schemaName, tableName);
 
@@ -197,11 +203,11 @@ public class SQLite3RubyJdbcConnection extends RubyJdbcConnection {
             catch (SQLException e) {
                 final String msg = e.getMessage();
                 if ( msg != null && msg.startsWith("[SQLITE_ERROR] SQL error or missing database") ) {
-                    return RubyArray.newEmptyArray(runtime); // on 3.8.7 getIndexInfo fails if table has no indexes
+                    return newEmptyArray(context); // on 3.8.7 getIndexInfo fails if table has no indexes
                 }
                 throw e;
             }
-            final RubyArray indexes = RubyArray.newArray(runtime, 8);
+            final RubyArray indexes = allocArray(context, 8);
             try {
                 String currentIndex = null;
 
@@ -226,14 +232,14 @@ public class SQLite3RubyJdbcConnection extends RubyJdbcConnection {
                             cachedString(context, indexTableName), // table_name
                             cachedString(context, indexName), // index_name
                             nonUnique ? context.fals : context.tru, // unique
-                            currentColumns = RubyArray.newArray(runtime, 4) // [] column names
+                            currentColumns = allocArray(context, 4) // [] column names
                         };
 
-                        indexes.append( IndexDefinition.newInstance(context, args, Block.NULL_BLOCK) ); // IndexDefinition.new
+                        indexes.append(context, IndexDefinition.newInstance(context, args, Block.NULL_BLOCK)); // IndexDefinition.new
                     }
 
                     // one or more columns can be associated with an index
-                    if ( currentColumns != null ) currentColumns.append(rubyColumnName);
+                    if ( currentColumns != null ) currentColumns.append(context, rubyColumnName);
                 }
 
                 return indexes;
@@ -314,11 +320,11 @@ public class SQLite3RubyJdbcConnection extends RubyJdbcConnection {
     protected RubyArray mapTables(final ThreadContext context, final Connection connection,
         final String catalog, final String schemaPattern, final String tablePattern,
         final ResultSet tablesSet) throws SQLException {
-        final RubyArray tables = context.runtime.newArray(24);
+        final RubyArray tables = allocArray(context, 24);
         while ( tablesSet.next() ) {
             String name = tablesSet.getString(TABLES_TABLE_NAME);
             name = name.toLowerCase(Locale.ENGLISH); // simply lower-case for SQLite3
-            tables.append( RubyString.newUnicodeString(context.runtime, name) );
+            tables.append(context, RubyString.newUnicodeString(context.runtime, name));
         }
         return tables;
     }
@@ -468,6 +474,50 @@ public class SQLite3RubyJdbcConnection extends RubyJdbcConnection {
     // 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().
+    // Override execute to ensure Rails 8 compatibility
+    // Rails 8 SQLite3 adapter expects execute to always return something that responds to to_a
+    @Override
+    @JRubyMethod(name = "execute", required = 1)
+    public IRubyObject execute(final ThreadContext context, final IRubyObject sql) {
+        final String query = sqlString(sql);
+        return withConnection(context, connection -> {
+            Statement statement = null;
+            try {
+                statement = createStatement(context, connection);
+
+                // SQLite3 can support multiple statements in one query
+                // Process all results but return the last one for Rails compatibility
+                boolean hasResultSet = doExecute(statement, query);
+                int updateCount = statement.getUpdateCount();
+                IRubyObject result = null;
+
+                do {
+                    // Query has results to process (insert/update/delete) we move on to next
+                    if (hasResultSet) {
+                        // For SELECT queries, return propr Result object
+                        try (ResultSet rs = statement.getResultSet()) {
+                            result = mapQueryResult(context, connection, rs);
+                        }
+                    }
+
+                    // Check to see if there is another result set
+                    hasResultSet = statement.getMoreResults();
+                    updateCount = statement.getUpdateCount();
+                } while (hasResultSet || updateCount != -1);
+
+                return result == null ?
+                        newEmptyResult(context) :
+                        result;
+
+            } catch (final SQLException e) {
+                debugErrorSQL(context, query);
+                throw e;
+            } finally {
+                close(statement);
+            }
+        });
+    }
+
     @JRubyMethod(name = "execute_batch2")
     public IRubyObject execute_batch2(ThreadContext context, IRubyObject statementsArg) {
         // Assume we will only call this with an array.
@@ -487,10 +537,10 @@ public class SQLite3RubyJdbcConnection extends RubyJdbcConnection {
 
                 int[] rows = statement.executeBatch();
 
-                RubyArray rowsAffected = runtime.newArray();
+                RubyArray rowsAffected = newArray(context);
 
                 for (int i = 0; i < rows.length; i++) {
-                    rowsAffected.append(runtime.newFixnum(rows[i]));
+                    rowsAffected.append(context, asFixnum(context, rows[i]));
                 }
                 return rowsAffected;
             } catch (final SQLException e) {
@@ -508,21 +558,20 @@ public class SQLite3RubyJdbcConnection extends RubyJdbcConnection {
         final Connection connection, final PreparedStatement statement,
         final int index, final IRubyObject value,
         final IRubyObject attribute, final int type) throws SQLException {
-        if (value instanceof RubyBigDecimal) {
-            statement.setString(index, ((RubyBigDecimal) value).getValue().toString());
+        if (value instanceof RubyBigDecimal bigDecimal) {
+            statement.setString(index, bigDecimal.getValue().toString());
         }
-        else if ( value instanceof RubyFixnum) {
-            statement.setLong(index, ((RubyFixnum) value).getLongValue());
+        else if ( value instanceof RubyFixnum fixnum) {
+            statement.setLong(index, fixnum.getValue());
         }
-        else if ( value instanceof RubyInteger) { // Bignum
-            statement.setString(index, ((RubyInteger) value).getBigIntegerValue().toString());
+        else if ( value instanceof RubyInteger integer) { // Bignum
+            statement.setString(index, integer.asBigInteger(context).toString());
         }
-        else if ( value instanceof RubyNumeric ) {
-            statement.setDouble(index, ((RubyNumeric) value).getDoubleValue());
+        else if ( value instanceof RubyNumeric numeric) {
+            statement.setDouble(index, numeric.asDouble(context));
         }
         else { // e.g. `BigDecimal '42.00000000000000000001'`
-            Ruby runtime = context.runtime;
-            RubyBigDecimal val = RubyBigDecimal.newInstance(context, runtime.getModule("BigDecimal"), value, RubyFixnum.zero(runtime));
+            RubyBigDecimal val = RubyBigDecimal.newInstance(context, getModule(context, "BigDecimal"), value, asFixnum(context, 0));
             statement.setString(index, val.getValue().toString());
         }
     }

data/src/java/arjdbc/util/DateTimeUtils.java

@@ -46,6 +46,7 @@ import org.jruby.util.ByteList;
 import org.jruby.util.TypeConverter;
 
 import static arjdbc.util.StringHelper.decByte;
+import static org.jruby.api.Access.objectClass;
 
 /**
  * Utilities for handling/converting dates and times.
@@ -279,12 +280,13 @@ public abstract class DateTimeUtils {
 
     // @Deprecated
     public static Timestamp convertToTimestamp(final RubyFloat value) {
-        final Timestamp timestamp = new Timestamp(value.getLongValue() * 1000); // millis
+        var context = value.getRuntime().getCurrentContext();
+        final Timestamp timestamp = new Timestamp(value.asLong(context) * 1000); // millis
 
         // for usec we shall not use: ((long) floatValue * 1000000) % 1000
         // if ( usec >= 0 ) timestamp.setNanos( timestamp.getNanos() + usec * 1000 );
         // due doubles inaccurate precision it's better to parse to_s :
-        final ByteList strValue = ((RubyString) value.to_s()).getByteList();
+        final ByteList strValue = ((RubyString) value.to_s(context)).getByteList();
         final int dot1 = strValue.lastIndexOf('.') + 1, dot4 = dot1 + 3;
         final int len = strValue.getRealSize() - strValue.getBegin();
         if ( dot1 > 0 && dot4 < len ) { // skip .123 but handle .1234
@@ -307,7 +309,7 @@ public abstract class DateTimeUtils {
 
     public static double adjustTimeFromDefaultZone(final IRubyObject value) {
         // Time's to_f is : ( millis * 1000 + usec ) / 1_000_000.0
-        final double time = value.convertToFloat().getDoubleValue(); // to_f
+        final double time = value.convertToFloat().getValue(); // to_f
         // NOTE: MySQL assumes default TZ thus need to adjust to match :
         final int offset = TimeZone.getDefault().getOffset((long) time * 1000);
         // Time's to_f is : ( millis * 1000 + usec ) / 1_000_000.0
@@ -584,8 +586,8 @@ public abstract class DateTimeUtils {
 
         DateTime dateTime = new DateTime(year, month, day, 0, 0, 0, 0, chronology);
 
-        final Ruby runtime = context.runtime;
-        return runtime.getClass("Date").newInstance(context, Java.getInstance(runtime, dateTime), Block.NULL_BLOCK);
+        return objectClass(context).getClass(context, "Date").
+                newInstance(context, Java.getInstance(context.runtime, dateTime), Block.NULL_BLOCK);
     }
 
     @SuppressWarnings("deprecation")

data/src/java/arjdbc/util/ObjectSupport.java

@@ -23,8 +23,9 @@ public abstract class ObjectSupport {
 
     private static StringBuilder inspect(final Ruby runtime, final RubyBasicObject self,
         final List<Variable> variableList) {
+        var context = runtime.getCurrentContext();
         final StringBuilder part = new StringBuilder();
-        String cname = self.getMetaClass().getRealClass().getName();
+        String cname = self.getMetaClass().getRealClass().getName(context);
         part.append("#<").append(cname).append(":0x");
         part.append(Integer.toHexString(System.identityHashCode(self)));
 
@@ -35,7 +36,6 @@ public abstract class ObjectSupport {
         }
         try {
             runtime.registerInspecting(self);
-            final ThreadContext context = runtime.getCurrentContext();
             return inspectObj(context, variableList, part);
         } finally {
             runtime.unregisterInspecting(self);

data/src/java/arjdbc/util/StringHelper.java

@@ -68,7 +68,7 @@ public abstract class StringHelper {
     public static RubyString newDefaultInternalString(final Ruby runtime, final CharSequence str) {
         Encoding enc = runtime.getDefaultInternalEncoding();
         if (enc == null) enc = runtime.getEncodingService().getJavaDefault();
-        return new RubyString(runtime, runtime.getString(), str, enc);
+        return RubyString.newString(runtime, str, enc);
     }
 
     // NOTE: a 'better' RubyString.newInternalFromJavaExternal - to be back-ported in JRuby 9.2

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbc-adapter
 version: !ruby/object:Gem::Version
-  version: '72.0'
+  version: 80.0.pre1
 platform: java
 authors:
 - Nick Sieger, Ola Bini, Karol Bucek and JRuby contributors
 bindir: bin
 cert_chain: []
-date: 2025-09-23 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.2.2
+        version: 8.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.2.2
+        version: 8.0.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, and SQLite3.'
@@ -36,7 +36,7 @@ extra_rdoc_files: []
 files:
 - ".github/workflows/ruby.yml"
 - ".gitignore"
-- ".travis.yml"
+- ".mise.toml"
 - ".yardopts"
 - CONTRIBUTING.md
 - Gemfile
@@ -203,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 4.0.3
 specification_version: 4
 summary: JDBC adapter for ActiveRecord, for use within JRuby on Rails.
 test_files: []

data/.travis.yml

@@ -1,128 +0,0 @@
-sudo: false
-dist: xenial
-
-services:
-  - mysql
-
-before_install:
-  - unset _JAVA_OPTIONS
-  - rvm @default,@global do gem uninstall bundler -a -x -I || true
-  - gem install bundler -v "~>1.17.3"
-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.14.0
-jdk:
-  - openjdk8
-
-script: bundle exec rake ${TEST_PREFIX}test_$DB
-before_script:
-  - echo "JAVA_OPTS=$JAVA_OPTS"
-  - export JRUBY_OPTS="-J-Xms64M -J-Xmx1024M"
-  - rake jar # compiles ext generates: lib/arjdbc/jdbc/adapter_java.jar
-  - mysql --version || true # to see if we're using MySQL or MariaDB
-  - '[ "$DB" == "postgresql" ] && [ "$TEST_PREFIX" == "" ] && rake db:postgresql || true'
-  - '[ "$DB" == "mysql2" ] && [ "$TEST_PREFIX" == "" ] && rake db:mysql || true'
-  - '[ "$DB" == "mariadb" ] && [ "$TEST_PREFIX" == "" ] && rake db:mysql || true'
-  - '[ "$DB" == "jdbc" ] && rake db:mysql || true'
-  - '[ "$DB" == "jndi" ] && rake db:mysql || true'
-  # rails:test setups :
-  - |
-    [ "$DB" == "mysql2" ] && [ "$TEST_PREFIX" == "rails:" ] && \
-    mysql -e "CREATE USER rails@localhost;" && \
-    mysql -e "grant all privileges on activerecord_unittest.* to rails@localhost;" && \
-    mysql -e "grant all privileges on activerecord_unittest2.* to rails@localhost;" && \
-    mysql -e "grant all privileges on inexistent_activerecord_unittest.* to rails@localhost;" && \
-    mysql -e "CREATE DATABASE activerecord_unittest DEFAULT CHARACTER SET utf8mb4;" && \
-    mysql -e "CREATE DATABASE activerecord_unittest2 DEFAULT CHARACTER SET utf8mb4;" \
-    || true
-  - |
-    [ "$DB" == "postgresql" ] && [ "$TEST_PREFIX" == "rails:" ] && \
-    psql  -c "create database activerecord_unittest;" -U postgres && \
-    psql  -c "create database activerecord_unittest2;" -U postgres \
-    || true
-
-env:
-  global:
-    - AR_VERSION="master"
-matrix:
-  allow_failures:
-    - rvm: jruby-head
-  include:
-    - env: DB=mysql2 PREPARED_STATEMENTS=false
-    - env: DB=mysql2 PREPARED_STATEMENTS=true
-    - env: DB=mysql2 DRIVER=MariaDB
-
-    - addons:
-        postgresql: "10"
-      env: DB=postgresql PREPARED_STATEMENTS=false INSERT_RETURNING=false
-    - addons:
-        postgresql: "10"
-      env: DB=postgresql PREPARED_STATEMENTS=false INSERT_RETURNING=true
-    - addons:
-        postgresql: "10"
-      env: DB=postgresql PREPARED_STATEMENTS=true
-    - addons:
-        postgresql: "10"
-      env: DB=postgresql PREPARED_STATEMENTS=true INSERT_RETURNING=true
-    - addons:
-        postgresql: "10"
-      env: DB=postgresql PREPARED_STATEMENTS=true JRUBY_OPTS=-J-Duser.timezone=America/Detroit
-    - addons:
-        postgresql: "9.4"
-      env: DB=postgresql PREPARED_STATEMENTS=true
-
-    - env: DB=sqlite3 PREPARED_STATEMENTS=false
-    - env: DB=sqlite3 PREPARED_STATEMENTS=true
-
-    - env: DB=jndi PREPARED_STATEMENTS=false
-    - env: DB=jndi PREPARED_STATEMENTS=true
-
-    # Java 11
-    - env: DB=mysql2
-      jdk: oraclejdk11
-    - env: DB=postgresql
-      jdk: oraclejdk11
-      addons:
-        postgresql: "10"
-    - env: DB=sqlite3
-      jdk: oraclejdk11
-
-    # jruby-head
-    - rvm: jruby-head
-      env: DB=mysql2
-    - rvm: jruby-head
-      env: DB=postgresql
-      addons:
-        postgresql: "10"
-    - rvm: jruby-head
-      env: DB=sqlite3
-
-    # testing against MariaDB
-    - addons:
-        mariadb: 10.2
-      env: DB=mariadb PREPARED_STATEMENTS=false
-    - addons:
-        mariadb: 10.3
-      env: DB=mariadb PREPARED_STATEMENTS=true
-
-    # Rails test-suite :
-    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="6-1-stable" # PS off by default
-    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="6-1-stable" PREPARED_STATEMENTS=true
-    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="6-1-stable" DRIVER=MariaDB
-
-    - addons:
-        postgresql: "10"
-      env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="6-1-stable" # PS on by default
-    - addons:
-        postgresql: "10"
-      env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="6-1-stable" PREPARED_STATEMENTS=false
-    - addons:
-        postgresql: "9.4"
-      env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="6-1-stable" # PS on by default
-
-    - env: DB=sqlite3    TEST_PREFIX="rails:" AR_VERSION="6-1-stable"