[postgres] quote and type_cast should not be overriden on 4.2 (+ port the _ versions)

Author: kares

lib/arjdbc/postgresql/adapter.rb

@@ -16,6 +16,12 @@ module PostgreSQL
     require 'arjdbc/postgresql/explain_support'
     require 'arjdbc/postgresql/schema_creation' # AR 4.x
 
+    # @private
+    IndexDefinition = ::ActiveRecord::ConnectionAdapters::IndexDefinition
+
+    # @private
+    Type = ::ActiveRecord::Type if AR42_COMPAT
+
     # @see ActiveRecord::ConnectionAdapters::JdbcAdapter#jdbc_connection_class
     def self.jdbc_connection_class
       ::ActiveRecord::ConnectionAdapters::PostgreSQLJdbcConnection
@@ -209,7 +215,23 @@ def type_cast(value, column, array_member = false)
       else
         super(value, column)
       end
-    end if AR4_COMPAT
+    end if AR4_COMPAT && ! AR42_COMPAT
+
+    # @private
+    def _type_cast(value)
+      case value
+      when Type::Binary::Data
+        # Return a bind param hash with format as binary.
+        # See http://deveiate.org/code/pg/PGconn.html#method-i-exec_prepared-doc
+        # for more information
+        { value: value.to_s, format: 1 }
+      when OID::Xml::Data, OID::Bit::Data
+        value.to_s
+      else
+        super
+      end
+    end if AR42_COMPAT
+    private :_type_cast if AR42_COMPAT
 
     NATIVE_DATABASE_TYPES = {
       :primary_key => "serial primary key",
@@ -888,20 +910,30 @@ def quote(value, column = nil)
       end
     end unless AR42_COMPAT
 
-    def quote(value, column = nil)
-      return super unless column
-
+    # @private
+    def _quote(value)
       case value
+      when Type::Binary::Data
+        "'#{escape_bytea(value.to_s)}'"
+      when OID::Xml::Data
+        "xml '#{quote_string(value.to_s)}'"
+      when OID::Bit::Data
+        if value.binary?
+          "B'#{value}'"
+        elsif value.hex?
+          "X'#{value}'"
+        end
       when Float
         if value.infinite? || value.nan?
-          "'#{value.to_s}'"
+          "'#{value}'"
         else
           super
         end
       else
         super
       end
     end if AR42_COMPAT
+    private :_quote if AR42_COMPAT
 
     # Quotes a string, escaping any ' (single quote) and \ (backslash) chars.
     # @return [String]
@@ -1236,9 +1268,6 @@ def index_name_exists?(table_name, index_name, default)
       SQL
     end if AR42_COMPAT
 
-    # @private
-    IndexDefinition = ::ActiveRecord::ConnectionAdapters::IndexDefinition
-
     # Returns an array of indexes for the given table.
     def indexes(table_name, name = nil)
       # NOTE: maybe it's better to leave things of to the JDBC API ?!

lib/arjdbc/postgresql/oid_types.rb

@@ -10,11 +10,10 @@ module PostgreSQL
     end
 
     # @private
-    module OIDTypes
-
-      OID = ActiveRecord::ConnectionAdapters::PostgreSQL::OID
+    OID = ::ActiveRecord::ConnectionAdapters::PostgreSQL::OID
 
-      Type = ActiveRecord::Type if AR42_COMPAT
+    # @private
+    module OIDTypes
 
       # @override
       def enable_extension(name)