minor postres compatibility tunings - on AR 4.2 load the type map eagerly (like in Rails)

Author: kares

lib/arjdbc/postgresql/adapter.rb

@@ -265,6 +265,7 @@ def native_database_types
     end
 
     # Adds `:array` option to the default set provided by the `AbstractAdapter`.
+    # @override
     def prepare_column_options(column, types)
       spec = super
       spec[:array] = 'true' if column.respond_to?(:array) && column.array
@@ -273,6 +274,7 @@ def prepare_column_options(column, types)
     end if AR4_COMPAT
 
     # Adds `:array` as a valid migration key.
+    # @override
     def migration_keys
       super + [:array]
     end if AR4_COMPAT
@@ -1378,6 +1380,8 @@ def initialize(*args)
 
       @table_alias_length = nil
 
+      initialize_type_map(@type_map = Type::HashLookupTypeMap.new) if AR42_COMPAT
+
       @use_insert_returning = @config.key?(:insert_returning) ?
         self.class.type_cast_config_to_boolean(@config[:insert_returning]) : nil
     end

lib/arjdbc/postgresql/oid_types.rb

@@ -44,7 +44,7 @@ def get_oid_type(oid, fmod, column_name)
         }
       end unless AR42_COMPAT
 
-      def get_oid_type(oid, fmod, column_name, sql_type = '') # :nodoc:
+      def get_oid_type(oid, fmod, column_name, sql_type = '')
         if !type_map.key?(oid)
           load_additional_types(type_map, [oid])
         end
@@ -79,7 +79,8 @@ def dup
       end
 
       def type_map
-        # NOTE: our type_map is lazy since it's only used for `adapter.accessor`
+        # NOTE: our type_map is lazy (on AR < 4.2)
+        # ... since it's only used for `adapter.accessor`
         @type_map ||= begin
           if type_map = @@type_map_cache[ type_cache_key ]
             type_map.dup
@@ -150,10 +151,10 @@ def initialize_type_map(type_map)
         end
       end unless AR42_COMPAT
 
-      def initialize_type_map(m) # :nodoc:
+      def initialize_type_map(m)
         register_class_with_limit m, 'int2', OID::Integer
-        m.alias_type 'int4', 'int2'
-        m.alias_type 'int8', 'int2'
+        register_class_with_limit m, 'int4', OID::Integer
+        register_class_with_limit m, 'int8', OID::Integer
         m.alias_type 'oid', 'int2'
         m.register_type 'float4', OID::Float.new
         m.alias_type 'float8', 'float4'
@@ -221,7 +222,7 @@ def initialize_type_map(m) # :nodoc:
         load_additional_types(m)
       end if AR42_COMPAT
 
-      def load_additional_types(type_map, oids = nil) # :nodoc:
+      def load_additional_types(type_map, oids = nil)
         if supports_ranges?
           query = <<-SQL
             SELECT t.oid, t.typname, t.typelem, t.typdelim, t.typinput, r.rngsubtype, t.typtype, t.typbasetype
@@ -235,11 +236,16 @@ def load_additional_types(type_map, oids = nil) # :nodoc:
           SQL
         end
 
+        initializer = OID::TypeMapInitializer.new(type_map)
+
         if oids
-          query += "WHERE t.oid::integer IN (%s)" % oids.join(", ")
+          query << "WHERE t.oid::integer IN (%s)" % oids.join(", ")
+        else
+          if initializer.respond_to?(:query_conditions_for_initial_load)
+            query << initializer.query_conditions_for_initial_load(type_map)
+          end
         end
 
-        initializer = OID::TypeMapInitializer.new(type_map)
         records = execute(query, 'SCHEMA')
         initializer.run(records)
       end if AR42_COMPAT