Skip to content

fix: remove deprecated Module access #1191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

fix: remove deprecated Module access #1191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/java/arjdbc/ArJdbcModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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 :
Expand Down
22 changes: 11 additions & 11 deletions src/java/arjdbc/jdbc/RubyJdbcConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -157,27 +157,27 @@ 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");
}

/**
* @param 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");
}

/**
* @param 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");
}

/**
Expand All @@ -202,31 +202,31 @@ 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");
}

/**
* @param 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");
}

/**
* @param 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");
}

/**
* @param 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")
Expand Down Expand Up @@ -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());
}
}

Expand Down
Loading