Merge pull request rails#49452 from Shopify/pg-ensure-type-map-loaded

Ensure PG connection is configured before looking up types
clouvet · Oct 2, 2023 · af2b1da · af2b1da
2 parents 7c303b9 + 618db13
commit af2b1da
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb b/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb
@@ -149,6 +149,7 @@ def type_cast(value) # :nodoc:
         end
 
         def lookup_cast_type_from_column(column) # :nodoc:
+          verify! if type_map.nil?
           type_map.lookup(column.oid, column.fmod, column.sql_type)
         end
 

diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -722,9 +722,7 @@ def initialize_type_map(m) # :nodoc:
       end
 
       private
-        def type_map
-          @type_map ||= Type::HashLookupTypeMap.new
-        end
+        attr_reader :type_map
 
         def initialize_type_map(m = type_map)
           self.class.initialize_type_map(m)