From db8f489220a1e89406718d9b48ac970be08cef4e Mon Sep 17 00:00:00 2001
From: Abdelkader Boudih <terminale@gmail.com>
Date: Wed, 11 Jun 2025 19:52:43 +0100
Subject: [PATCH] fix: remove deprecated Module access

---
 src/java/arjdbc/ArJdbcModule.java            |  4 ++--
 src/java/arjdbc/jdbc/RubyJdbcConnection.java | 22 ++++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/java/arjdbc/ArJdbcModule.java b/src/java/arjdbc/ArJdbcModule.java
index d509e934e..498952a01 100644
--- a/src/java/arjdbc/ArJdbcModule.java
+++ b/src/java/arjdbc/ArJdbcModule.java
@@ -58,7 +58,7 @@ public static RubyModule load(final Ruby runtime) {
     }
 
     public static RubyModule get(final Ruby runtime) {
-        return runtime.getModule("ArJdbc");
+        return (RubyModule) runtime.getObject().getConstantAt("ArJdbc");
     }
 
     public static void warn(final ThreadContext context, final String message) {
@@ -230,7 +230,7 @@ private static IRubyObject loadDriver(final ThreadContext context, final IRubyOb
             return null;
         }
 
-        final RubyModule jdbc = runtime.getModule("Jdbc");
+        final RubyModule jdbc = (RubyModule) runtime.getObject().getConstantAt("Jdbc");
         if ( jdbc != null ) { // Jdbc::MySQL
             final RubyModule constant = (RubyModule) jdbc.getConstantAt(constName);
             if ( constant != null ) { // ::Jdbc::MySQL.load_driver :
diff --git a/src/java/arjdbc/jdbc/RubyJdbcConnection.java b/src/java/arjdbc/jdbc/RubyJdbcConnection.java
index 07bee76a6..54b11f20a 100644
--- a/src/java/arjdbc/jdbc/RubyJdbcConnection.java
+++ b/src/java/arjdbc/jdbc/RubyJdbcConnection.java
@@ -135,8 +135,8 @@ public class RubyJdbcConnection extends RubyObject {
 
     protected RubyJdbcConnection(Ruby runtime, RubyClass metaClass) {
         super(runtime, metaClass);
-        attributeClass = runtime.getModule("ActiveModel").getClass("Attribute");
-        timeZoneClass = runtime.getModule("ActiveSupport").getClass("TimeWithZone");
+        attributeClass = (RubyClass) ((RubyModule) runtime.getObject().getConstantAt("ActiveModel")).getConstant("Attribute");
+        timeZoneClass = (RubyClass) ((RubyModule) runtime.getObject().getConstantAt("ActiveSupport")).getConstant("TimeWithZone");
     }
 
     private static final ObjectAllocator ALLOCATOR = new ObjectAllocator() {
@@ -157,11 +157,11 @@ public static RubyClass getJdbcConnection(final Ruby runtime) {
     }
 
     protected static RubyModule ActiveRecord(ThreadContext context) {
-        return context.runtime.getModule("ActiveRecord");
+        return (RubyModule) context.runtime.getObject().getConstantAt("ActiveRecord");
     }
 
     public static RubyClass getBase(final Ruby runtime) {
-        return (RubyClass) runtime.getModule("ActiveRecord").getConstantAt("Base");
+        return (RubyClass) ((RubyModule) runtime.getObject().getConstantAt("ActiveRecord")).getConstantAt("Base");
     }
 
     /**
@@ -169,7 +169,7 @@ public static RubyClass getBase(final Ruby runtime) {
      * @return <code>ActiveRecord::Result</code>
      */
     public static RubyClass getResult(final Ruby runtime) {
-        return (RubyClass) runtime.getModule("ActiveRecord").getConstantAt("Result");
+        return (RubyClass) ((RubyModule) runtime.getObject().getConstantAt("ActiveRecord")).getConstantAt("Result");
     }
 
     /**
@@ -177,7 +177,7 @@ public static RubyClass getResult(final Ruby runtime) {
      * @return <code>ActiveRecord::ConnectionAdapters</code>
      */
     public static RubyModule getConnectionAdapters(final Ruby runtime) {
-        return (RubyModule) runtime.getModule("ActiveRecord").getConstantAt("ConnectionAdapters");
+        return (RubyModule) ((RubyModule) runtime.getObject().getConstantAt("ActiveRecord")).getConstantAt("ConnectionAdapters");
     }
 
     /**
@@ -202,7 +202,7 @@ protected static RubyClass getForeignKeyDefinition(final Ruby runtime) {
      * @return <code>ActiveRecord::JDBCError</code>
      */
     protected static RubyClass getJDBCError(final Ruby runtime) {
-        return runtime.getModule("ActiveRecord").getClass("JDBCError");
+        return ((RubyModule) runtime.getObject().getConstantAt("ActiveRecord")).getClass("JDBCError");
     }
 
     /**
@@ -210,7 +210,7 @@ protected static RubyClass getJDBCError(final Ruby runtime) {
      * @return <code>ActiveRecord::ConnectionNotEstablished</code>
      */
     protected static RubyClass getConnectionNotEstablished(final Ruby runtime) {
-        return runtime.getModule("ActiveRecord").getClass("ConnectionNotEstablished");
+        return ((RubyModule) runtime.getObject().getConstantAt("ActiveRecord")).getClass("ConnectionNotEstablished");
     }
 
     /**
@@ -218,7 +218,7 @@ protected static RubyClass getConnectionNotEstablished(final Ruby runtime) {
      * @return <code>ActiveRecord::NoDatabaseError</code>
      */
     protected static RubyClass getNoDatabaseError(final Ruby runtime) {
-        return runtime.getModule("ActiveRecord").getClass("NoDatabaseError");
+        return ((RubyModule) runtime.getObject().getConstantAt("ActiveRecord")).getClass("NoDatabaseError");
     }
 
     /**
@@ -226,7 +226,7 @@ protected static RubyClass getNoDatabaseError(final Ruby runtime) {
      * @return <code>ActiveRecord::TransactionIsolationError</code>
      */
     protected static RubyClass getTransactionIsolationError(final Ruby runtime) {
-        return (RubyClass) runtime.getModule("ActiveRecord").getConstant("TransactionIsolationError");
+        return (RubyClass) ((RubyModule) runtime.getObject().getConstantAt("ActiveRecord")).getConstant("TransactionIsolationError");
     }
 
     @JRubyMethod(name = "transaction_isolation", alias = "get_transaction_isolation")
@@ -2734,7 +2734,7 @@ else if ( value instanceof RubyNumeric ) {
         else { // e.g. `BigDecimal '42.00000000000000000001'`
             Ruby runtime = context.runtime;
             statement.setBigDecimal(index,
-                    RubyBigDecimal.newInstance(context, runtime.getModule("BigDecimal"), value, RubyFixnum.zero(runtime)).getValue());
+                    RubyBigDecimal.newInstance(context, (RubyModule) runtime.getObject().getConstantAt("BigDecimal"), value, RubyFixnum.zero(runtime)).getValue());
         }
     }