Merge pull request #15249 from sgrif/sg-register-types-in-adapter

Use the generic type map for all PG type registrations

2 files changed, 13 insertions, 73 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/oid.rb b/activerecord/lib/active_record/connection_adapters/postgresql/oid.rb
index e54c092bf6..2494e19f84 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/oid.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/oid.rb
@@ -27,73 +27,6 @@ module ActiveRecord
   module ConnectionAdapters
     module PostgreSQL
       module OID # :nodoc:
-        # When the PG adapter connects, the pg_type table is queried. The
-        # key of this hash maps to the `typname` column from the table.
-        # type_map is then dynamically built with oids as the key and type
-        # objects as values.
-        NAMES = Hash.new { |h,k| # :nodoc:
-          h[k] = Type::Value.new
-        }
-
-        # Register an OID type named +name+ with a typecasting object in
-        # +type+. +name+ should correspond to the `typname` column in
-        # the `pg_type` table.
-        def self.register_type(name, type)
-          NAMES[name] = type
-        end
-
-        # Alias the +old+ type to the +new+ type.
-        def self.alias_type(new, old)
-          NAMES[new] = NAMES[old]
-        end
-
-        # Is +name+ a registered type?
-        def self.registered_type?(name)
-          NAMES.key? name
-        end
-
-        register_type 'int2', OID::Integer.new
-        alias_type 'int4', 'int2'
-        alias_type 'int8', 'int2'
-        alias_type 'oid', 'int2'
-        register_type 'numeric', OID::Decimal.new
-        register_type 'float4', OID::Float.new
-        alias_type 'float8', 'float4'
-        register_type 'text', Type::Text.new
-        register_type 'varchar', Type::String.new
-        alias_type 'char', 'varchar'
-        alias_type 'name', 'varchar'
-        alias_type 'bpchar', 'varchar'
-        register_type 'bool', Type::Boolean.new
-        register_type 'bit', OID::Bit.new
-        alias_type 'varbit', 'bit'
-        register_type 'timestamp', OID::DateTime.new
-        alias_type 'timestamptz', 'timestamp'
-        register_type 'date', OID::Date.new
-        register_type 'time', OID::Time.new
-
-        register_type 'money', OID::Money.new
-        register_type 'bytea', OID::Bytea.new
-        register_type 'point', OID::Point.new
-        register_type 'hstore', OID::Hstore.new
-        register_type 'json', OID::Json.new
-        register_type 'cidr', OID::Cidr.new
-        register_type 'inet', OID::Inet.new
-        register_type 'uuid', OID::Uuid.new
-        register_type 'xml', SpecializedString.new(:xml)
-        register_type 'tsvector', SpecializedString.new(:tsvector)
-        register_type 'macaddr', SpecializedString.new(:macaddr)
-        register_type 'citext', SpecializedString.new(:citext)
-        register_type 'ltree', SpecializedString.new(:ltree)
-
-        # FIXME: why are we keeping these types as strings?
-        alias_type 'interval', 'varchar'
-        alias_type 'path', 'varchar'
-        alias_type 'line', 'varchar'
-        alias_type 'polygon', 'varchar'
-        alias_type 'circle', 'varchar'
-        alias_type 'lseg', 'varchar'
-        alias_type 'box', 'varchar'
       end
     end
   end
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/oid/type_map_initializer.rb b/activerecord/lib/active_record/connection_adapters/postgresql/oid/type_map_initializer.rb
index 27829ae1a3..28f7a4eafb 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/oid/type_map_initializer.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/oid/type_map_initializer.rb
@@ -13,7 +13,8 @@ module ActiveRecord
           end
 
           def run(records)
-            mapped, nodes = records.partition { |row| OID.registered_type? row['typname'] }
+            nodes = records.reject { |row| @store.key? row['oid'].to_i }
+            mapped, nodes = nodes.partition { |row| @store.key? row['typname'] }
             ranges, nodes = nodes.partition { |row| row['typtype'] == 'r' }
             enums, nodes = nodes.partition { |row| row['typtype'] == 'e' }
             domains, nodes = nodes.partition { |row| row['typtype'] == 'd' }
@@ -30,7 +31,7 @@ module ActiveRecord
 
           private
           def register_mapped_type(row)
-            register row['oid'], OID::NAMES[row['typname']]
+            alias_type row['oid'], row['typname']
           end
 
           def register_enum_type(row)
@@ -64,12 +65,18 @@ module ActiveRecord
           end
 
           def register(oid, oid_type)
-            oid = oid.to_i
+            oid = assert_valid_registration(oid, oid_type)
+            @store.register_type(oid, oid_type)
+          end
 
-            raise ArgumentError, "can't register nil type for OID #{oid}" if oid_type.nil?
-            return if @store.key?(oid)
+          def alias_type(oid, target)
+            oid = assert_valid_registration(oid, target)
+            @store.alias_type(oid, target)
+          end
 
-            @store.register_type(oid, oid_type)
+          def assert_valid_registration(oid, oid_type)
+            raise ArgumentError, "can't register nil type for OID #{oid}" if oid_type.nil?
+            oid.to_i
           end
         end
       end