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

data/src/java/arjdbc/mssql/MSSQLModule.java

@@ -45,9 +45,9 @@ import org.jruby.util.ByteList;
 public class MSSQLModule {
 
     public static RubyModule load(final RubyModule arJdbc) {
-        RubyModule mssql = arJdbc.defineModuleUnder("MSSQL");
-        mssql.defineAnnotatedMethods( MSSQLModule.class );
-        return mssql;
+        var context = arJdbc.getRuntime().getCurrentContext();
+        return arJdbc.defineModuleUnder(context, "MSSQL").
+                defineMethods(context, MSSQLModule.class);
     }
 
     public static RubyModule load(final Ruby runtime) {

data/src/java/arjdbc/mssql/MSSQLRubyJdbcConnection.java

@@ -60,6 +60,8 @@ import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.util.ByteList;
 
+import static org.jruby.api.Create.newArray;
+
 /**
  *
  * @author nicksieger
@@ -118,17 +120,19 @@ public class MSSQLRubyJdbcConnection extends RubyJdbcConnection {
         super(runtime, metaClass);
     }
 
-    public static RubyClass createMSSQLJdbcConnectionClass(Ruby runtime, RubyClass jdbcConnection) {
-        final RubyClass clazz = getConnectionAdapters(runtime). // ActiveRecord::ConnectionAdapters
-            defineClassUnder("MSSQLJdbcConnection", jdbcConnection, ALLOCATOR);
-        clazz.defineAnnotatedMethods(MSSQLRubyJdbcConnection.class);
-        getConnectionAdapters(runtime).setConstant("MssqlJdbcConnection", clazz); // backwards-compat
+    public static RubyClass createMSSQLJdbcConnectionClass(ThreadContext context, RubyClass jdbcConnection) {
+        RubyClass clazz = getConnectionAdapters(context). // ActiveRecord::ConnectionAdapters
+                defineClassUnder(context, "MSSQLJdbcConnection", jdbcConnection, ALLOCATOR).
+                defineMethods(context, MSSQLRubyJdbcConnection.class);
+        getConnectionAdapters(context).setConstant(context, "MssqlJdbcConnection", clazz);
+
         return clazz;
     }
 
     public static RubyClass load(final Ruby runtime) {
-        RubyClass jdbcConnection = getJdbcConnection(runtime);
-        return createMSSQLJdbcConnectionClass(runtime, jdbcConnection);
+        var context = runtime.getCurrentContext();
+        RubyClass jdbcConnection = getJdbcConnection(context);
+        return createMSSQLJdbcConnectionClass(context, jdbcConnection);
     }
 
     protected static final ObjectAllocator ALLOCATOR = new ObjectAllocator() {
@@ -187,7 +191,7 @@ public class MSSQLRubyJdbcConnection extends RubyJdbcConnection {
                     } else if (results.size() == 1) {
                         return results.get(0);
                     } else {
-                        return context.runtime.newArray(results);
+                        return newArray(context, results);
                     }
 
                 } catch (final SQLException e) {
@@ -331,7 +335,7 @@ public class MSSQLRubyJdbcConnection extends RubyJdbcConnection {
             final String catalog, final String schemaPattern, final String tablePattern,
             final ResultSet tablesSet) throws SQLException, IllegalStateException {
 
-        final RubyArray tables = context.runtime.newArray();
+        final RubyArray tables = newArray(context);
 
         while ( tablesSet.next() ) {
             String schema = tablesSet.getString(TABLES_TABLE_SCHEM);

data/src/java/arjdbc/mysql/MySQLModule.java

@@ -42,9 +42,9 @@ import static arjdbc.util.QuotingUtils.quoteCharAndDecorateWith;
 public class MySQLModule {
 
     public static RubyModule load(final RubyModule arJdbc) {
-        RubyModule mysql = arJdbc.defineModuleUnder("MySQL");
-        mysql.defineAnnotatedMethods(MySQLModule.class);
-        return mysql;
+        var context = arJdbc.getRuntime().getCurrentContext();
+        return arJdbc.defineModuleUnder(context, "MySQL").
+                defineMethods(context, MySQLModule.class);
     }
 
     public static RubyModule load(final Ruby runtime) {

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

@@ -29,26 +29,28 @@ import arjdbc.jdbc.Callable;
 import arjdbc.jdbc.DriverWrapper;
 import arjdbc.jdbc.RubyJdbcConnection;
 import arjdbc.util.DateTimeUtils;
+import org.jruby.Ruby;
+import org.jruby.RubyBoolean;
+import org.jruby.RubyClass;
+import org.jruby.anno.JRubyMethod;
+import org.jruby.exceptions.RaiseException;
+import org.jruby.runtime.ObjectAllocator;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.util.SafePropertyAccessor;
 
 import java.lang.reflect.InvocationTargetException;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.PreparedStatement;
-import java.sql.SQLException;
 import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.sql.Statement;
 import java.sql.Timestamp;
 import java.sql.Types;
 
-import org.jruby.*;
-import org.jruby.anno.JRubyMethod;
-import org.jruby.exceptions.RaiseException;
-import org.jruby.runtime.ObjectAllocator;
-import org.jruby.runtime.ThreadContext;
-import org.jruby.runtime.builtin.IRubyObject;
-import org.jruby.util.SafePropertyAccessor;
-
-import static arjdbc.util.StringHelper.newString;
+import static org.jruby.api.Create.newEmptyString;
+import static org.jruby.api.Create.newString;
 
 /**
  *
@@ -62,19 +64,23 @@ public class MySQLRubyJdbcConnection extends RubyJdbcConnection {
         super(runtime, metaClass);
     }
 
-    public static RubyClass createMySQLJdbcConnectionClass(Ruby runtime, RubyClass jdbcConnection) {
-        RubyClass clazz = getConnectionAdapters(runtime).
-            defineClassUnder("MySQLJdbcConnection", jdbcConnection, ALLOCATOR);
-        clazz.defineAnnotatedMethods(MySQLRubyJdbcConnection.class);
-        return clazz;
+    public static RubyClass createMySQLJdbcConnectionClass(ThreadContext context, RubyClass jdbcConnection) {
+        return getConnectionAdapters(context).
+                defineClassUnder(context, "MySQLJdbcConnection", jdbcConnection, ALLOCATOR).
+                defineMethods(context, MySQLRubyJdbcConnection.class);
     }
 
     public static RubyClass load(final Ruby runtime) {
-        RubyClass jdbcConnection = getJdbcConnection(runtime);
-        return createMySQLJdbcConnectionClass(runtime, jdbcConnection);
+        var context = runtime.getCurrentContext();
+        RubyClass jdbcConnection = getJdbcConnection(context);
+        return createMySQLJdbcConnectionClass(context, jdbcConnection);
     }
 
-    protected static final ObjectAllocator ALLOCATOR = MySQLRubyJdbcConnection::new;
+    protected static final ObjectAllocator ALLOCATOR = new ObjectAllocator() {
+        public IRubyObject allocate(Ruby runtime, RubyClass klass) {
+            return new MySQLRubyJdbcConnection(runtime, klass);
+        }
+    };
 
     @JRubyMethod
     public IRubyObject query(final ThreadContext context, final IRubyObject sql) throws SQLException {
@@ -85,7 +91,7 @@ public class MySQLRubyJdbcConnection extends RubyJdbcConnection {
     public IRubyObject db_version(final ThreadContext context) {
         return withConnection(context, (Callable<IRubyObject>) connection -> {
             final DatabaseMetaData metaData = connection.getMetaData();
-            return context.runtime.newString(metaData.getDatabaseProductVersion());
+            return newString(context, metaData.getDatabaseProductVersion());
         });
     }
 
@@ -98,13 +104,13 @@ public class MySQLRubyJdbcConnection extends RubyJdbcConnection {
             final int major = jdbcDriver.getMajorVersion();
             final int minor = jdbcDriver.getMinorVersion();
             if ( major < 5 ) {
-                final RubyClass errorClass = getConnectionNotEstablished(context.runtime);
+                final RubyClass errorClass = getConnectionNotEstablished(context);
                 throw context.runtime.newRaiseException(errorClass,
                         "MySQL adapter requires driver >= 5.0 got: " + major + "." + minor);
             }
             if ( major == 5 && minor < 1 ) { // need 5.1 for JDBC 4.0
                 // lightweight validation query: "/* ping */ SELECT 1"
-                setConfigValueIfNotSet(context, "connection_alive_sql", context.runtime.newString("/* ping */ SELECT 1"));
+                setConfigValueIfNotSet(context, "connection_alive_sql", newString(context, "/* ping */ SELECT 1"));
             }
             driverAdapter = new MySQLDriverAdapter(); // short-circuit
         }
@@ -203,11 +209,11 @@ public class MySQLRubyJdbcConnection extends RubyJdbcConnection {
 
         final Timestamp value = resultSet.getTimestamp(column);
         if ( value == null ) {
-            return resultSet.wasNull() ? context.nil : RubyString.newEmptyString(runtime);
+            return resultSet.wasNull() ? context.nil : newEmptyString(context);
         }
 
         if ( rawDateTime != null && rawDateTime) {
-            return RubyString.newString(runtime, DateTimeUtils.dummyTimeToString(value));
+            return newString(context, DateTimeUtils.dummyTimeToString(value));
         }
 
         return DateTimeUtils.newDummyTime(context, value, getDefaultTimeZone(context));
@@ -219,7 +225,7 @@ public class MySQLRubyJdbcConnection extends RubyJdbcConnection {
         throws SQLException {
         final byte[] bytes = resultSet.getBytes(column);
         if ( bytes == null /* || resultSet.wasNull() */ ) return context.nil;
-        return newString(runtime, bytes);
+        return newString(context, bytes);
     }
 
     // MySQL does never storesUpperCaseIdentifiers() :

data/src/java/arjdbc/oracle/OracleModule.java

@@ -42,9 +42,8 @@ import org.jruby.runtime.builtin.IRubyObject;
 public class OracleModule {
 
     public static RubyModule load(final RubyModule arJdbc) {
-        RubyModule oracle = arJdbc.defineModuleUnder("Oracle");
-        oracle.defineAnnotatedMethods( OracleModule.class );
-        return oracle;
+        var context = arJdbc.getRuntime().getCurrentContext();
+        return arJdbc.defineModuleUnder(context, "Oracle").defineMethods(context, OracleModule.class);
     }
 
     public static RubyModule load(final Ruby runtime) {

data/src/java/arjdbc/oracle/OracleRubyJdbcConnection.java

@@ -60,6 +60,10 @@ import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 
+import static org.jruby.api.Convert.asFixnum;
+import static org.jruby.api.Create.allocArray;
+import static org.jruby.api.Create.newString;
+
 /**
  *
  * @author nicksieger
@@ -71,16 +75,16 @@ public class OracleRubyJdbcConnection extends RubyJdbcConnection {
         super(runtime, metaClass);
     }
 
-    public static RubyClass createOracleJdbcConnectionClass(Ruby runtime, RubyClass jdbcConnection) {
-        final RubyClass clazz = getConnectionAdapters(runtime).
-            defineClassUnder("OracleJdbcConnection", jdbcConnection, ALLOCATOR);
-        clazz.defineAnnotatedMethods(OracleRubyJdbcConnection.class);
-        return clazz;
+    public static RubyClass createOracleJdbcConnectionClass(ThreadContext context, RubyClass jdbcConnection) {
+        return getConnectionAdapters(context).
+                defineClassUnder(context, "OracleJdbcConnection", jdbcConnection, ALLOCATOR).
+                defineMethods(context, OracleRubyJdbcConnection.class);
     }
 
     public static RubyClass load(final Ruby runtime) {
-        RubyClass jdbcConnection = getJdbcConnection(runtime);
-        return createOracleJdbcConnectionClass(runtime, jdbcConnection);
+        var context = runtime.getCurrentContext();
+        RubyClass jdbcConnection = getJdbcConnection(context);
+        return createOracleJdbcConnectionClass(context, jdbcConnection);
     }
 
     protected static final ObjectAllocator ALLOCATOR = new ObjectAllocator() {
@@ -158,11 +162,11 @@ public class OracleRubyJdbcConnection extends RubyJdbcConnection {
 
     @Override
     protected IRubyObject mapGeneratedKeys(
-        final Ruby runtime, final Connection connection,
+        ThreadContext context, final Connection connection,
         final Statement statement, final Boolean singleResult)
         throws SQLException {
         if ( generatedKeys ) {
-            return super.mapGeneratedKeys(runtime, connection, statement, singleResult);
+            return super.mapGeneratedKeys(context, connection, statement, singleResult);
         }
         return null; // disabled using -Darjdbc.oracle.generated_keys=false
     }
@@ -171,14 +175,14 @@ public class OracleRubyJdbcConnection extends RubyJdbcConnection {
 
     @Override // NOTE: Invalid column type:
     // getLong not implemented for class oracle.jdbc.driver.T4CRowidAccessor
-    protected IRubyObject mapGeneratedKey(final Ruby runtime, final ResultSet genKeys)
+    protected IRubyObject mapGeneratedKey(ThreadContext context, final ResultSet genKeys)
         throws SQLException {
         // NOTE: it's likely a ROWID which we do not care about :
         final String value = genKeys.getString(1); // "AAAsOjAAFAAABUlAAA"
         if ( isPositiveInteger(value) ) {
-            return runtime.newFixnum( Long.parseLong(value) );
+            return asFixnum(context, Long.parseLong(value));
         }
-        return returnRowID ? RubyString.newString(runtime, value) : runtime.getNil();
+        return returnRowID ? newString(context, value) : context.nil;
     }
 
     private static boolean isPositiveInteger(final String value) {
@@ -254,13 +258,13 @@ public class OracleRubyJdbcConnection 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(32);
+        final RubyArray tables = allocArray(context, 32);
         while ( tablesSet.next() ) {
             String name = tablesSet.getString(TABLES_TABLE_NAME);
             name = caseConvertIdentifierForRails(connection, name);
             // Handle stupid Oracle 10g RecycleBin feature
             if ( name.startsWith("bin$") ) continue;
-            tables.append(RubyString.newUnicodeString(context.runtime, name));
+            tables.append(context, RubyString.newUnicodeString(context.runtime, name));
         }
         return tables;
     }
@@ -396,10 +400,10 @@ public class OracleRubyJdbcConnection extends RubyJdbcConnection {
                         return describe(context, name.toString(), owner);
                     }
 
-                    final RubyArray arr = RubyArray.newArray(context.runtime, 3);
-                    arr.append( context.runtime.newString(owner) );
-                    arr.append( context.runtime.newString(table_name) );
-                    if ( dbLink != null ) arr.append( context.runtime.newString(dbLink) );
+                    final RubyArray arr = allocArray(context, 3);
+                    arr.append(context, newString(context, owner));
+                    arr.append(context, newString(context, table_name));
+                    if ( dbLink != null ) arr.append(context, newString(context, dbLink));
                     return arr;
                 }
                 catch (final SQLException e) {

data/src/java/arjdbc/postgresql/PostgreSQLModule.java

@@ -42,9 +42,8 @@ import org.jruby.util.ByteList;
 public class PostgreSQLModule {
 
     public static RubyModule load(final RubyModule arJdbc) {
-        RubyModule postgreSQL = arJdbc.defineModuleUnder("PostgreSQL");
-        postgreSQL.defineAnnotatedMethods( PostgreSQLModule.class );
-        return postgreSQL;
+        var context = arJdbc.getRuntime().getCurrentContext();
+        return arJdbc.defineModuleUnder(context, "PostgreSQL").defineMethods(context, PostgreSQLModule.class);
     }
 
     public static RubyModule load(final Ruby runtime) {

data/src/java/arjdbc/postgresql/PostgreSQLResult.java

@@ -23,6 +23,12 @@ import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 
+import static org.jruby.api.Access.enumerableModule;
+import static org.jruby.api.Access.getModule;
+import static org.jruby.api.Access.objectClass;
+import static org.jruby.api.Convert.toInt;
+import static org.jruby.api.Error.argumentError;
+
 /*
  * This class mimics the PG::Result class enough to get by.  It also adorns common methods useful for
  * gems like mini_sql to consume it similarly to PG::Result
@@ -35,10 +41,13 @@ public class PostgreSQLResult extends JdbcResult {
 
     /********* JRuby compat methods ***********/
 
-    static RubyClass createPostgreSQLResultClass(Ruby runtime, RubyClass postgreSQLConnection) {
-        RubyClass rubyClass = postgreSQLConnection.defineClassUnder("Result", runtime.getObject(), ObjectAllocator.NOT_ALLOCATABLE_ALLOCATOR);
-        rubyClass.defineAnnotatedMethods(PostgreSQLResult.class);
-        rubyClass.includeModule(runtime.getEnumerable());
+    static RubyClass createPostgreSQLResultClass(ThreadContext context, RubyClass postgreSQLConnection) {
+        RubyClass rubyClass = postgreSQLConnection.
+                defineClassUnder(context, "Result", objectClass(context), ObjectAllocator.NOT_ALLOCATABLE_ALLOCATOR).
+                defineMethods(context, PostgreSQLResult.class);
+
+        rubyClass.includeModule(context, enumerableModule(context));
+
         return rubyClass;
     }
 
@@ -130,7 +139,10 @@ public class PostgreSQLResult extends JdbcResult {
     }
 
     private RubyClass getBinaryDataClass(final ThreadContext context) {
-        return ((RubyModule) context.runtime.getModule("ActiveModel").getConstantAt("Type")).getClass("Binary").getClass("Data");
+        return getModule(context, "ActiveModel").
+                getModule(context, "Type").
+                getClass(context, "Binary").
+                getClass(context, "Data");
     }
 
     private boolean isBinaryType(final int type) {
@@ -145,7 +157,7 @@ public class PostgreSQLResult extends JdbcResult {
      */
     @PG @JRubyMethod(name = {"length", "ntuples", "num_tuples"})
     public IRubyObject length(final ThreadContext context) {
-        return values.length();
+        return values.length(context);
     }
 
     /**
@@ -219,21 +231,21 @@ public class PostgreSQLResult extends JdbcResult {
     @PG @JRubyMethod
     public IRubyObject getvalue(ThreadContext context, IRubyObject rowArg, IRubyObject columnArg) {
         int rows = values.size();
-        int row = RubyNumeric.fix2int(rowArg);
-        int column = RubyNumeric.fix2int(columnArg);
+        int row = toInt(context, rowArg);
+        int column = toInt(context, columnArg);
 
-        if (row < 0 || row >= rows) throw context.runtime.newArgumentError("invalid tuple number " + row);
-        if (column < 0 || column >= getColumnNames().length) throw context.runtime.newArgumentError("invalid field number " + row);
+        if (row < 0 || row >= rows) throw argumentError(context, "invalid tuple number " + row);
+        if (column < 0 || column >= getColumnNames().length) throw argumentError(context, "invalid field number " + row);
 
         return ((RubyArray) values.eltInternal(row)).eltInternal(column);
     }
 
     @PG @JRubyMethod(name = "[]")
     public IRubyObject aref(ThreadContext context, IRubyObject rowArg) {
-        int row = RubyNumeric.fix2int(rowArg);
+        int row = toInt(context, rowArg);
         int rows = values.size();
 
-        if (row < 0 || row >= rows) throw context.runtime.newArgumentError("Index " + row + " is out of range");
+        if (row < 0 || row >= rows) throw argumentError(context, "Index " + row + " is out of range");
 
         RubyArray rowValues = (RubyArray) values.eltOk(row);
         RubyHash resultHash = RubyHash.newSmallHash(context.runtime);

data/src/java/arjdbc/postgresql/PostgreSQLRubyJdbcConnection.java

@@ -115,21 +115,22 @@ public class PostgreSQLRubyJdbcConnection extends arjdbc.jdbc.RubyJdbcConnection
     public PostgreSQLRubyJdbcConnection(Ruby runtime, RubyClass metaClass) {
         super(runtime, metaClass);
 
-        resultClass = getMetaClass().getClass("Result");
+        resultClass = getMetaClass().getClass(runtime.getCurrentContext(), "Result");
     }
 
-    public static RubyClass createPostgreSQLJdbcConnectionClass(Ruby runtime, RubyClass jdbcConnection) {
-        final RubyClass clazz = getConnectionAdapters(runtime).
-            defineClassUnder("PostgreSQLJdbcConnection", jdbcConnection, ALLOCATOR);
-        clazz.defineAnnotatedMethods(PostgreSQLRubyJdbcConnection.class);
-        getConnectionAdapters(runtime).setConstant("PostgresJdbcConnection", clazz); // backwards-compat
+    public static RubyClass createPostgreSQLJdbcConnectionClass(ThreadContext context, RubyClass jdbcConnection) {
+        final RubyClass clazz = getConnectionAdapters(context).
+                defineClassUnder(context, "PostgreSQLJdbcConnection", jdbcConnection, ALLOCATOR).
+                defineMethods(context, PostgreSQLRubyJdbcConnection.class);
+        getConnectionAdapters(context).setConstant(context, "PostgresJdbcConnection", clazz); // backwards-compat
         return clazz;
     }
 
     public static RubyClass load(final Ruby runtime) {
-        RubyClass jdbcConnection = getJdbcConnection(runtime);
-        RubyClass postgreSQLConnection = createPostgreSQLJdbcConnectionClass(runtime, jdbcConnection);
-        PostgreSQLResult.createPostgreSQLResultClass(runtime, postgreSQLConnection);
+        var context = runtime.getCurrentContext();
+        RubyClass jdbcConnection = getJdbcConnection(context);
+        RubyClass postgreSQLConnection = createPostgreSQLJdbcConnectionClass(context, jdbcConnection);
+        PostgreSQLResult.createPostgreSQLResultClass(context, postgreSQLConnection);
         return postgreSQLConnection;
     }
 
@@ -223,8 +224,11 @@ public class PostgreSQLRubyJdbcConnection extends arjdbc.jdbc.RubyJdbcConnection
 
     private RubyClass oidArray(final ThreadContext context) {
         if (oidArray != null) return oidArray;
-        final RubyModule PostgreSQL = (RubyModule) getConnectionAdapters(context.runtime).getConstant("PostgreSQL");
-        return oidArray = ((RubyModule) PostgreSQL.getConstantAt("OID")).getClass("Array");
+
+        return getConnectionAdapters(context).
+                getModule(context, "PostgreSQL").
+                getModule(context, "OID").
+                getClass(context, "Array");
     }
 
 
@@ -384,7 +388,7 @@ public class PostgreSQLRubyJdbcConnection extends arjdbc.jdbc.RubyJdbcConnection
             }
         }
 
-        if ( ! "Date".equals(value.getMetaClass().getName()) && value.respondsTo("to_date") ) {
+        if ( ! "Date".equals(value.getMetaClass().getName(context)) && value.respondsTo("to_date") ) {
             value = value.callMethod(context, "to_date");
         }
 

data/src/java/arjdbc/sqlite3/SQLite3Module.java

@@ -41,9 +41,8 @@ import org.jruby.runtime.builtin.IRubyObject;
 public class SQLite3Module {
     
     public static RubyModule load(final RubyModule arJdbc) {
-        RubyModule sqlite3 = arJdbc.defineModuleUnder("SQLite3");
-        sqlite3.defineAnnotatedMethods( SQLite3Module.class );
-        return sqlite3;
+        var context = arJdbc.getRuntime().getCurrentContext();
+        return arJdbc.defineModuleUnder(context, "SQLite3").defineMethods(context, SQLite3Module.class);
     }
 
     public static RubyModule load(final Ruby runtime) {