Minimal fixes to be able to run postgres tests

Author: JesseChavez

lib/arjdbc/abstract/connection_management.rb

@@ -36,10 +36,13 @@ def disconnect!
       #  end
       # end
 
+      private
+
       # DIFFERENCE: we delve into jdbc shared code and this does self.class.new_client.
       def connect
-        @raw_connection = jdbc_connection_class(@config[:adapter_spec]).new(@config, self)
-        @raw_connection.configure_connection
+        @raw_connection = jdbc_connection_class.new(@connection_parameters, self)
+      rescue ConnectionNotEstablished => ex
+        raise ex.set_pool(@pool)
       end
 
       def reconnect

lib/arjdbc/abstract/core.rb

@@ -2,23 +2,17 @@
 
 module ArJdbc
   module Abstract
-
     # This is minimum amount of code needed from base JDBC Adapter class to make common adapters
     # work.  This replaces using jdbc/adapter as a base class for all adapters.
     module Core
-
-      attr_reader :config
-
-      def initialize(config)
-        @config = config
+      def initialize(...)
+        super
 
         if self.class.equal? ActiveRecord::ConnectionAdapters::JdbcAdapter
           spec = @config.key?(:adapter_spec) ? @config[:adapter_spec] :
                      ( @config[:adapter_spec] = adapter_spec(@config) ) # due resolving visitor
           extend spec if spec
         end
-
-        super(config) # AbstractAdapter
       end
 
       # Retrieve the raw `java.sql.Connection` object.

lib/arjdbc/postgresql/adapter.rb

@@ -52,8 +52,8 @@ def adapter_name
     def redshift?
       # SELECT version() :
       #  PostgreSQL 8.0.2 on i686-pc-linux-gnu, compiled by GCC gcc (GCC) 3.4.2 20041017 (Red Hat 3.4.2-6.fc3), Redshift 1.0.647
-      if ( redshift = config[:redshift] ).nil?
-        redshift = !! (@connection.database_product || '').index('Redshift')
+      if (redshift = @config[:redshift]).nil?
+        redshift = !! (valid_raw_connection.database_product || '').index('Redshift')
       end
       redshift
     end
@@ -73,8 +73,8 @@ def configure_connection
         # see http://jdbc.postgresql.org/documentation/91/connect.html
         # self.set_client_encoding(encoding)
       #end
-      self.client_min_messages = config[:min_messages] || 'warning'
-      self.schema_search_path = config[:schema_search_path] || config[:schema_order]
+      self.client_min_messages = @config[:min_messages] || 'warning'
+      self.schema_search_path = @config[:schema_search_path] || @config[:schema_order]
 
       # Use standard-conforming strings if available so we don't have to do the E'...' dance.
       set_standard_conforming_strings
@@ -93,14 +93,17 @@ def configure_connection
 
       # SET statements from :variables config hash
       # http://www.postgresql.org/docs/8.3/static/sql-set.html
-      (config[:variables] || {}).map do |k, v|
+      (@config[:variables] || {}).map do |k, v|
         if v == ':default' || v == :default
           # Sets the value to the global or compile default
           execute("SET SESSION #{k} TO DEFAULT", 'SCHEMA')
         elsif ! v.nil?
           execute("SET SESSION #{k} TO #{quote(v)}", 'SCHEMA')
         end
       end
+
+      @type_map = Type::HashLookupTypeMap.new
+      initialize_type_map
     end
 
     # @private
@@ -370,7 +373,7 @@ def use_insert_returning?
 
     def get_database_version # :nodoc:
       begin
-        version = @connection.database_product
+        version = valid_raw_connection.database_product
         if match = version.match(/([\d\.]*\d).*?/)
           version = match[1].split('.').map(&:to_i)
           # PostgreSQL version representation does not have more than 4 digits
@@ -761,16 +764,17 @@ class PostgreSQLAdapter < AbstractAdapter
     # AR expects OID to be available on the adapter
     OID = ActiveRecord::ConnectionAdapters::PostgreSQL::OID
 
-    def initialize(connection, logger = nil, connection_parameters = nil, config = {})
+    def initialize(...)
+      super
+
+      conn_params = @config.compact
+
+      @connection_parameters = conn_params
+
       # @local_tz is initialized as nil to avoid warnings when connect tries to use it
       @local_tz = nil
       @max_identifier_length = nil
 
-      super(connection, logger, config) # configure_connection happens in super
-
-      @type_map = Type::HashLookupTypeMap.new
-      initialize_type_map
-
       @use_insert_returning = @config.key?(:insert_returning) ?
         self.class.type_cast_config_to_boolean(@config[:insert_returning]) : true
     end
@@ -793,7 +797,7 @@ def self.database_exists?(config)
     public :sql_for_insert
     alias :postgresql_version :database_version
 
-    def jdbc_connection_class(spec)
+    def jdbc_connection_class
       ::ArJdbc::PostgreSQL.jdbc_connection_class
     end
 
@@ -829,8 +833,10 @@ def exec_no_cache(sql, name, binds, async: false)
 
       type_casted_binds = type_casted_binds(binds)
       log(sql, name, binds, type_casted_binds, async: async) do
-        ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
-          @connection.exec_params(sql, type_casted_binds)
+        with_raw_connection do |conn|
+          result = conn.exec_params(sql, type_casted_binds)
+          verified!
+          result
         end
       end
     end