Fix postgres version tests failures

we needed to add new_client class method similar to active record CRuby
adapters so we can easily mock the raw_connection.

Author: JesseChavez

lib/arjdbc/abstract/connection_management.rb

@@ -40,7 +40,7 @@ def disconnect!
 
       # DIFFERENCE: we delve into jdbc shared code and this does self.class.new_client.
       def connect
-        @raw_connection = jdbc_connection_class.new(@connection_parameters, self)
+        @raw_connection = self.class.new_client(@connection_parameters, self)
       rescue ConnectionNotEstablished => ex
         raise ex.set_pool(@pool)
       end

lib/arjdbc/mysql/adapter.rb

@@ -33,6 +33,16 @@ class Mysql2Adapter < AbstractMysqlAdapter
 
       include ArJdbc::MySQL
 
+      class << self
+        def jdbc_connection_class
+          ::ActiveRecord::ConnectionAdapters::MySQLJdbcConnection
+        end
+
+        def new_client(conn_params, adapter_instance)
+          jdbc_connection_class.new(conn_params, adapter_instance)
+        end
+      end
+
       def initialize(...)
         super
 
@@ -221,10 +231,6 @@ def get_full_version
         @full_version ||= any_raw_connection.full_version
       end
 
-      def jdbc_connection_class
-        ::ActiveRecord::ConnectionAdapters::MySQLJdbcConnection
-      end
-
       def jdbc_column_class
         ::ActiveRecord::ConnectionAdapters::MySQL::Column
       end

lib/arjdbc/postgresql/adapter.rb

@@ -35,11 +35,6 @@ module PostgreSQL
     # @private
     Type = ::ActiveRecord::Type
 
-    # @see ActiveRecord::ConnectionAdapters::JdbcAdapter#jdbc_connection_class
-    def self.jdbc_connection_class
-      ::ActiveRecord::ConnectionAdapters::PostgreSQLJdbcConnection
-    end
-
     # @see ActiveRecord::ConnectionAdapters::JdbcAdapter#jdbc_column_class
     def jdbc_column_class; ::ActiveRecord::ConnectionAdapters::PostgreSQLColumn end
 
@@ -763,6 +758,16 @@ class PostgreSQLAdapter < AbstractAdapter
     # AR expects OID to be available on the adapter
     OID = ActiveRecord::ConnectionAdapters::PostgreSQL::OID
 
+    class << self
+      def jdbc_connection_class
+        ::ActiveRecord::ConnectionAdapters::PostgreSQLJdbcConnection
+      end
+
+      def new_client(conn_params, adapter_instance)
+        jdbc_connection_class.new(conn_params, adapter_instance)
+      end
+    end
+
     def initialize(...)
       super
 
@@ -796,10 +801,6 @@ def self.database_exists?(config)
     public :sql_for_insert
     alias :postgresql_version :database_version
 
-    def jdbc_connection_class
-      ::ArJdbc::PostgreSQL.jdbc_connection_class
-    end
-
     private
 
     FEATURE_NOT_SUPPORTED = "0A000" # :nodoc:

lib/arjdbc/sqlite3/adapter.rb

@@ -825,15 +825,6 @@ def jdbc_column_class
       ::ActiveRecord::ConnectionAdapters::SQLite3Column
     end
 
-    def jdbc_connection_class
-      self.class.jdbc_connection_class
-    end
-
-    # @see ActiveRecord::ConnectionAdapters::JdbcAdapter#jdbc_connection_class
-    def self.jdbc_connection_class
-      ::ActiveRecord::ConnectionAdapters::SQLite3JdbcConnection
-    end
-
     # Note: This is not an override of ours but a moved line from AR Sqlite3Adapter to register ours vs our copied module (which would be their class).
 #    ActiveSupport.run_load_hooks(:active_record_sqlite3adapter, SQLite3Adapter)
 
@@ -851,6 +842,14 @@ def _limit
     ::ActiveRecord::Type.register(:integer, SQLite3Integer, adapter: :sqlite3)
 
     class << self
+      def jdbc_connection_class
+        ::ActiveRecord::ConnectionAdapters::SQLite3JdbcConnection
+      end
+
+      def new_client(conn_params, adapter_instance)
+        jdbc_connection_class.new(conn_params, adapter_instance)
+      end
+
       def dbconsole(config, options = {})
         args = []
 

test/db/postgresql/version_test.rb

@@ -50,12 +50,15 @@ def test_pg_single_version
   private
 
   def connection_stub(version, full_version = false)
-    connection = mock('connection')
-    connection.stubs(:jndi?)
-    connection.stubs(:configure_connection)
-    connection.expects(:database_product).returns full_version ? version.to_s : "PostgreSQL #{version}"
+    raw_connection = mock('raw_connection')
+    raw_connection.stubs(:execute)
+    raw_connection.stubs(:exec_params)
+
+    ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.stubs(:new_client).returns(raw_connection)
     ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.any_instance.stubs(:initialize_type_map)
-    pg_connection = ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.new(connection, nil, {})
+
+    raw_connection.expects(:database_product).returns(full_version ? version.to_s : "PostgreSQL #{version}").at_least_once
+    pg_connection = ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.new({})
     pg_connection.database_version
   end
 end