Merge branch '51-stable' into 52-stable

* 51-stable:
  [test] fix query cache tests for Rail 5.1..6.0 (#991)
  Remove use of deprecated (in 9.2) Exceptions API

Author: kares

src/java/arjdbc/ArJdbcModule.java

@@ -29,7 +29,6 @@
 import java.util.Map;
 import java.util.WeakHashMap;
 
-import org.jruby.NativeException;
 import org.jruby.Ruby;
 import org.jruby.RubyArray;
 import org.jruby.RubyClass;
@@ -148,13 +147,7 @@ public static IRubyObject load_java_part(final ThreadContext context,
             }
         }
         catch (ClassNotFoundException e) { /* ignored */ }
-        catch (NoSuchMethodException e) {
-            throw newNativeException(runtime, e);
-        }
-        catch (IllegalAccessException e) {
-            throw newNativeException(runtime, e);
-        }
-        catch (InvocationTargetException e) {
+        catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
             throw newNativeException(runtime, e);
         }
 
@@ -263,18 +256,15 @@ private static Object invokeStatic(final Ruby runtime,
         try {
             return klass.getMethod(name, argType).invoke(null, arg);
         }
-        catch (IllegalAccessException e) {
-            throw newNativeException(runtime, e);
-        }
-        catch (InvocationTargetException e) {
+        catch (IllegalAccessException | InvocationTargetException e) {
             throw newNativeException(runtime, e);
         }
     }
 
     private static RaiseException newNativeException(final Ruby runtime, final Throwable cause) {
-        RubyClass nativeClass = runtime.getClass(NativeException.CLASS_NAME);
-        NativeException nativeException = new NativeException(runtime, nativeClass, cause);
-        return new RaiseException(cause, nativeException);
+        final RaiseException error = runtime.newRuntimeError(cause.toString());
+        error.initCause(cause);
+        return error;
     }
 
     @JRubyMethod(meta = true)

src/java/arjdbc/derby/DerbyRubyJdbcConnection.java

@@ -83,8 +83,8 @@ protected DriverWrapper newDriverWrapper(final ThreadContext context, final Stri
             final int minor = jdbcDriver.getMinorVersion();
             if ( major < 10 || ( major == 10 && minor < 5 ) ) {
                 final RubyClass errorClass = getConnectionNotEstablished(context.runtime);
-                throw new RaiseException(context.runtime, errorClass,
-                    "adapter requires Derby >= 10.5 got: " + major + "." + minor + "", false);
+                throw context.runtime.newRaiseException(errorClass,
+                    "adapter requires Derby >= 10.5 got: " + major + "." + minor + "");
             }
             if ( major == 10 && minor < 8 ) { // 10.8 ~ supports JDBC 4.1
                 // config[:connection_alive_sql] ||= 'SELECT 1 FROM SYS.SYSSCHEMAS FETCH FIRST 1 ROWS ONLY'

src/java/arjdbc/jdbc/RubyJdbcConnection.java

@@ -1807,7 +1807,7 @@ private ConnectionFactory setDriverFactory(final ThreadContext context) {
         if ( url.isNil() || ( driver.isNil() && driver_instance.isNil() ) ) {
             final Ruby runtime = context.runtime;
             final RubyClass errorClass = getConnectionNotEstablished( runtime );
-            throw new RaiseException(runtime, errorClass, "adapter requires :driver class and jdbc :url", false);
+            throw runtime.newRaiseException(errorClass, "adapter requires :driver class and jdbc :url");
         }
 
         final String jdbcURL = buildURL(context, url);
@@ -3008,7 +3008,7 @@ private Connection getConnectionInternal(final boolean required) throws SQLExcep
     private void handleNotConnected() {
         final Ruby runtime = getRuntime();
         final RubyClass errorClass = getConnectionNotEstablished( runtime );
-        throw new RaiseException(runtime, errorClass, "no connection available", false);
+        throw runtime.newRaiseException(errorClass, "no connection available");
     }
 
     /**
@@ -3545,7 +3545,7 @@ protected RaiseException wrapException(final ThreadContext context, final Throwa
             return (RaiseException) exception;
         }
         if ( exception instanceof RuntimeException ) {
-            return RaiseException.createNativeRaiseException(runtime, exception);
+            return wrapException(context, context.runtime.getRuntimeError(), exception);
         }
         // NOTE: compat - maybe makes sense or maybe not (e.g. IOException) :
         return wrapException(context, getJDBCError(runtime), exception);
@@ -3558,7 +3558,7 @@ public static RaiseException wrapException(final ThreadContext context,
 
     public static RaiseException wrapException(final ThreadContext context,
                                                final RubyClass errorClass, final Throwable exception, final String message) {
-        final RaiseException error = new RaiseException(context.runtime, errorClass, message, true);
+        final RaiseException error = context.runtime.newRaiseException(errorClass, message);
         error.initCause(exception);
         return error;
     }

src/java/arjdbc/mysql/MySQLRubyJdbcConnection.java

@@ -107,8 +107,8 @@ protected DriverWrapper newDriverWrapper(final ThreadContext context, final Stri
             final int minor = jdbcDriver.getMinorVersion();
             if ( major < 5 ) {
                 final RubyClass errorClass = getConnectionNotEstablished(context.runtime);
-                throw new RaiseException(context.runtime, errorClass,
-                    "MySQL adapter requires driver >= 5.0 got: " + major + "." + minor + "", false);
+                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"

test/simple.rb

@@ -1035,7 +1035,6 @@ def test_connection_valid
   end
 
   def test_query_cache
-    pend '#839 is open to resolve if this is really a valid test or not in 5.1'  if ActiveRecord::Base.connection.adapter_name =~ /mysql|sqlite|postgres/i
     user_1 = User.create! :login => 'query_cache_1'
     user_2 = User.create! :login => 'query_cache_2'
     user_3 = User.create! :login => 'query_cache_3'

test/test_helper.rb

@@ -500,7 +500,7 @@ def initialize(ignored_sql = self.class.ignored_sql)
     end
 
     def call(name, start, finish, message_id, values)
-      return if 'CACHE' == values[:name]
+      return if values[:cached]
 
       sql = values[:sql]
       sql = sql.to_sql unless sql.is_a?(String)