feat: make type_map ractor shareable

Fixes #389

Author: BuonOmo

lib/active_record/connection_adapters/cockroachdb/oid/spatial.rb

@@ -27,14 +27,21 @@ class Spatial < Type::Value
           #   "geometry(Geography,4326)"
           def initialize(oid, sql_type)
             super()
-            @sql_type = sql_type
-            @geo_type, @srid, @has_z, @has_m = self.class.parse_sql_type(sql_type)
-            @spatial_factory =
-              RGeo::ActiveRecord::SpatialFactoryStore.instance.factory(
-                factory_attrs
-              )
+            @sql_type = sql_type.freeze
+            @factory_attrs = self.class
+              .parse_sql_type(sql_type)
+              .then { |geo_type, srid, has_z, has_m|
+                {
+                  geo_type: geo_type.underscore.freeze,
+                  srid: srid.freeze,
+                  has_z: has_z.freeze,
+                  has_m: has_m.freeze,
+                  sql_type: type.to_s.freeze
+                }
+              }
+              .freeze
           end
-          protected attr_reader :sql_type, :spatial_factory
+          protected attr_reader :sql_type, :factory_attrs
 
           # sql_type: geometry, geometry(Point), geometry(Point,4326), ...
           #
@@ -66,7 +73,7 @@ def self.parse_sql_type(sql_type)
           end
 
           def geographic?
-            @sql_type =~ /geography/
+            @sql_type.start_with?("geography")
           end
 
           def spatial?
@@ -94,14 +101,14 @@ def serialize(value)
           # TODO: add tests (see #390)
           def ==(other)
             super &&
-              @sql_type == other.sql_type
-              @spatial_factory == other.spatial_factory
+              @sql_type == other.sql_type &&
+              @factory_attrs == other.factory_attrs
           end
           alias eql? ==
 
           # TODO: add tests (see #390)
           def hash
-            super ^ [@sql_type, @spatial_factory].hash
+            super ^ [@sql_type, @factory_attrs].hash
           end
 
           private
@@ -125,20 +132,16 @@ def binary_string?(string)
 
           def wkt_parser(string)
             if binary_string?(string)
-              RGeo::WKRep::WKBParser.new(@spatial_factory, support_ewkb: true, default_srid: @srid)
+              RGeo::WKRep::WKBParser.new(spatial_factory, support_ewkb: true, default_srid: @srid)
             else
-              RGeo::WKRep::WKTParser.new(@spatial_factory, support_ewkt: true, default_srid: @srid)
+              RGeo::WKRep::WKTParser.new(spatial_factory, support_ewkt: true, default_srid: @srid)
             end
           end
 
-          def factory_attrs
-            {
-              geo_type: @geo_type.underscore,
-              has_m: @has_m,
-              has_z: @has_z,
-              srid: @srid,
-              sql_type: type.to_s
-            }
+          def spatial_factory
+            RGeo::ActiveRecord::SpatialFactoryStore.instance.factory(
+              factory_attrs
+            )
           end
         end
       end

test/excludes/ActiveRecord/AdapterTest.rb

@@ -1,4 +1,3 @@
 exclude :test_indexes, "Rails transactional tests are being used while making schema changes. See https://www.cockroachlabs.com/docs/stable/online-schema-changes.html#limited-support-for-schema-changes-within-transactions."
 exclude :test_remove_index_when_name_and_wrong_column_name_specified, "Rails transactional tests are being used while making schema changes. See https://www.cockroachlabs.com/docs/stable/online-schema-changes.html#limited-support-for-schema-changes-within-transactions."
 exclude :test_remove_index_when_name_and_wrong_column_name_specified_positional_argument, "Rails transactional tests are being used while making schema changes. See https://www.cockroachlabs.com/docs/stable/online-schema-changes.html#limited-support-for-schema-changes-within-transactions."
-exclude :test_type_map_is_ractor_shareable, "Not yet, see https://github.com/cockroachdb/activerecord-cockroachdb-adapter/issues/389"