Bypass DriverManager for JDBC connections loaded at runtime

When the Oracle JDBC jar is added to the load path at runtime (rather
than being on the system classpath), java.sql.DriverManager refuses
to hand out connections with "No suitable driver". Fall back to
calling ORACLE_DRIVER.connect directly with username/password
properties so the connection still succeeds.

The fallback is scoped narrowly: only Java::JavaSql::SQLException
whose message matches /no suitable driver/i triggers it; any other
SQLException (auth/network/SQL errors) re-raises so the original
error surfaces unchanged.

Apply the same change in spec/spec_helper.rb so the JRuby test
harness behaves consistently.

Author: yahonda

lib/plsql/jdbc_connection.rb

@@ -35,7 +35,8 @@
     end
   end
 
-  java.sql.DriverManager.registerDriver Java::oracle.jdbc.OracleDriver.new
+  ORACLE_DRIVER = Java::oracle.jdbc.OracleDriver.new
+  java.sql.DriverManager.registerDriver ORACLE_DRIVER
 
   # set tns_admin property from TNS_ADMIN environment variable
   if !java.lang.System.get_property("oracle.net.tns_admin") && ENV["TNS_ADMIN"]
@@ -51,7 +52,19 @@ module PLSQL
   class JDBCConnection < Connection  # :nodoc:
     def self.create_raw(params)
       url = jdbc_connection_url(params)
-      new(java.sql.DriverManager.getConnection(url, params[:username], params[:password]))
+      conn = begin
+        java.sql.DriverManager.getConnection(url, params[:username], params[:password])
+      rescue Java::JavaSql::SQLException => e
+        raise unless e.message =~ /no suitable driver/i
+        # bypass DriverManager to work in cases where ojdbc*.jar
+        # is added to the load path at runtime and not on the
+        # system classpath
+        ORACLE_DRIVER.connect(url, java.util.Properties.new.tap do |props|
+          props.setProperty("user", params[:username])
+          props.setProperty("password", params[:password])
+        end)
+      end
+      new(conn)
     end
 
     def self.jdbc_connection_url(params)

spec/spec_helper.rb

@@ -88,7 +88,18 @@ def get_connection(user_number = 0)
     end
   else
     try_to_connect(Java::JavaSql::SQLException) do
-      java.sql.DriverManager.getConnection(get_connection_url, database_user, database_password)
+      begin
+        java.sql.DriverManager.getConnection(get_connection_url, database_user, database_password)
+      rescue Java::JavaSql::SQLException => e
+        raise unless e.message =~ /no suitable driver/i
+        # bypass DriverManager to work in cases where ojdbc*.jar
+        # is added to the load path at runtime and not on the
+        # system classpath
+        ORACLE_DRIVER.connect(get_connection_url, java.util.Properties.new.tap do |props|
+          props.setProperty("user", database_user)
+          props.setProperty("password", database_password)
+        end)
+      end
     end
   end
 end