activerecord-trilogis-adapter 8.0.0 → 8.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d6986c4a92cdff8495b93cf837edbc946a9401c1a12a2b639bc7440c974d0d6
-  data.tar.gz: b5663960d9aa5514a8c495d6603871c20acbdfdbdd534d78da2c70eb8f4e154d
+  metadata.gz: 1c43e31eb6d57d6b2eaf0ed551c13c729e1a7366e71f368871e358f262c6acac
+  data.tar.gz: 53488d879dd78083bc5671f5067a9b357a4f453213e2df373c9cf0e321542c6e
 SHA512:
-  metadata.gz: 784de6dc127d3c4f584ed540d37391e1bbb88496ff1e05c9e0229686356b4bd69af33635910b7c81dd12844b649f9db9808458d4251734a4531b7261c2ee99bc
-  data.tar.gz: 3e9e4ddea564f8e6843baa1f36104b83f5679b5ecb0ed46e8e0edb5c7f97f942534640f5a35d582dbae3a5c6332c59af828eb7a14b41c21b92f6f2637ae53123
+  metadata.gz: 384a3d95ec59d189d0615d2571498a0d7c7feff5f65862fd166f14d468eefd73c67fbc89072574b32aafebb1c36a79570f3221a8878f9b0272016a06f784eceb
+  data.tar.gz: d87c990d357629fb81929572fb4feedafae6dce63e7eb78be41552bc0d1f22f41a8ccc98c21327ac96060180d49349ad8a78fdb2b52b817d1f97c9243b10076a

data/lib/active_record/connection_adapters/trilogis/schema_creation.rb

@@ -9,7 +9,10 @@ module ActiveRecord
         def add_column_options!(sql, options)
           # Add SRID option for spatial columns in MySQL 8.0+
           # Format: /*!80003 SRID #{srid} */
-          sql << " /*!80003 SRID #{options[:srid]} */" if options[:srid]
+          if options[:srid]
+            sql_result = "#{sql} /*!80003 SRID #{options[:srid]} */"
+            sql.replace(sql_result)
+          end
 
           super
         end

data/lib/active_record/connection_adapters/trilogis/schema_statements.rb

@@ -77,18 +77,20 @@ module ActiveRecord
           if spatial_type?(type.to_s)
             # Build ALTER TABLE statement for spatial column
             sql_type = spatial_sql_type(type, options[:type])
-            sql = "ALTER TABLE #{quote_table_name(table_name)} ADD #{quote_column_name(column_name)} #{sql_type}"
+            base_sql = "ALTER TABLE #{quote_table_name(table_name)} " \
+                       "ADD #{quote_column_name(column_name)} #{sql_type}"
+            sql_parts = [base_sql]
 
             # Add SRID if specified
-            sql << " SRID #{options[:srid]}" if options[:srid] && options[:srid] != 0
+            sql_parts << " SRID #{options[:srid]}" if options[:srid] && options[:srid] != 0
 
             # Add NULL constraint
-            sql << " NOT NULL" if options[:null] == false
+            sql_parts << " NOT NULL" if options[:null] == false
 
             # Add DEFAULT if specified (allow falsy values like 0/false)
-            sql << " DEFAULT #{quote_default_expression(options[:default], nil)}" if options.key?(:default)
+            sql_parts << " DEFAULT #{quote_default_expression(options[:default], nil)}" if options.key?(:default)
 
-            execute sql
+            execute sql_parts.join
 
             # Clear memoized spatial column info for this table
             clear_spatial_cache_for(table_name)
@@ -159,10 +161,19 @@ module ActiveRecord
         # Build a spatial column from field metadata
         def build_spatial_column(table_name, field, field_name, sql_type)
           spatial_info = spatial_column_info(table_name).get(field_name, sql_type)
+
+          # Keep original sql_type in metadata (point, linestring, etc.)
+          # This preserves the actual geometric type for @geo_type_name
           type_metadata = fetch_type_metadata(sql_type)
 
+          # Lookup cast type as "geometry" for schema dumper compatibility
+          # Schema dumper validates cast_type, and only "geometry" is registered as table method
+          # Actual type is preserved in sql_type_metadata and limit hash
+          cast_type = lookup_cast_type("geometry")
+
           SpatialColumn.new(
             field_name,
+            cast_type,
             extract_field_value(field, :Default, :default),
             type_metadata,
             extract_field_value(field, :Null, :null) == "YES",
@@ -180,14 +191,14 @@ module ActiveRecord
         def visit_ColumnDefinition(o)
           if spatial_column?(o)
             sql_type = spatial_sql_type(o.sql_type, o.options[:type])
-            column_sql = "#{quote_column_name(o.name)} #{sql_type}"
+            column_sql_parts = ["#{quote_column_name(o.name)} #{sql_type}"]
 
             # Add SRID if specified (MySQL 8.0+ syntax: COLUMN TYPE SRID value)
-            column_sql << " SRID #{o.options[:srid]}" if o.options[:srid] && o.options[:srid] != 0
+            column_sql_parts << " SRID #{o.options[:srid]}" if o.options[:srid] && o.options[:srid] != 0
 
-            column_sql << " NOT NULL" unless o.null
-            column_sql << " DEFAULT #{quote_default_expression(o.default, o)}" unless o.default.nil?
-            column_sql
+            column_sql_parts << " NOT NULL" unless o.null
+            column_sql_parts << " DEFAULT #{quote_default_expression(o.default, o)}" unless o.default.nil?
+            column_sql_parts.join
           else
             super
           end

data/lib/active_record/connection_adapters/trilogis/spatial_column.rb

@@ -13,7 +13,7 @@ module ActiveRecord
 
     module Trilogis
       class SpatialColumn < ActiveRecord::ConnectionAdapters::MySQL::Column
-        attr_reader :geometric_type, :srid
+        attr_reader :geometric_type, :srid, :geo_type_name
 
         # Map SQL type strings to RGeo type classes
         GEOMETRIC_TYPES = {
@@ -27,24 +27,26 @@ module ActiveRecord
           "geometrycollection" => RGeo::Feature::GeometryCollection
         }.freeze
 
-        def initialize(name, default, sql_type_metadata = nil, null = true, default_function = nil, collation: nil,
-                       comment: nil, spatial_info: nil, **)
-          super(name, default, sql_type_metadata, null, default_function, collation: collation, comment: comment)
+        def initialize(name, cast_type, default, sql_type_metadata = nil, null = true,
+                       default_function = nil, collation: nil, comment: nil, spatial_info: nil, **)
+          super(name, cast_type, default, sql_type_metadata, null, default_function,
+                collation: collation, comment: comment)
 
-          return unless spatial?
+          # Guard against nil cast_type during OID registration
+          return unless cast_type && spatial?
 
           if spatial_info
             # Use spatial info from INFORMATION_SCHEMA if available
-            geo_type_str = spatial_info[:type].to_s.downcase
-            @geometric_type = GEOMETRIC_TYPES[geo_type_str] || RGeo::Feature::Geometry
+            @geo_type_name = spatial_info[:type].to_s.downcase
+            @geometric_type = GEOMETRIC_TYPES[@geo_type_name] || RGeo::Feature::Geometry
             @srid = spatial_info[:srid] || 0
             @has_z = spatial_info[:has_z] || false
             @has_m = spatial_info[:has_m] || false
           else
             # Fallback to extracting from SQL type
-            type_info = Type::Spatial.new(sql_type_metadata.sql_type)
-            geo_type_str = type_info.geo_type.to_s.downcase
-            @geometric_type = GEOMETRIC_TYPES[geo_type_str] || RGeo::Feature::Geometry
+            @geo_type_name = sql_type_metadata.sql_type.to_s.downcase
+            type_info = Type::Spatial.new(@geo_type_name)
+            @geometric_type = GEOMETRIC_TYPES[@geo_type_name] || RGeo::Feature::Geometry
             @srid = type_info.srid || 0
             @has_z = false
             @has_m = false
@@ -52,6 +54,9 @@ module ActiveRecord
         end
 
         def spatial?
+          # Guard against nil sql_type_metadata during type registration
+          return false unless sql_type_metadata&.sql_type
+
           TrilogisAdapter::SPATIAL_COLUMN_TYPES.include?(sql_type_metadata.sql_type.downcase)
         end
 
@@ -63,14 +68,25 @@ module ActiveRecord
           @has_m || false
         end
 
+        # Return Rails type for schema dumper
+        # Returns the actual geometric type (point, linestring, etc.) as symbol
+        # This allows schema dumper to generate t.point, t.linestring, etc.
+        def type
+          return super unless spatial?
+
+          # Return actual geometric type as symbol
+          # This matches PostGIS approach and enables proper schema dumping
+          @geo_type_name&.to_sym || :geometry
+        end
+
         # Return limit as hash with spatial metadata for schema dumper
+        # Only includes SRID (type is already in column type)
         def limit
           return super unless spatial?
 
-          {
-            type: sql_type_metadata.sql_type.downcase,
-            srid: @srid
-          }
+          # Only include SRID in limit
+          # Type information is in the type() method
+          { srid: @srid }.compact
         end
       end
     end

data/lib/active_record/connection_adapters/trilogis_adapter.rb

@@ -104,9 +104,6 @@ module ActiveRecord
         # Override the visitor for spatial support
         @visitor = Arel::Visitors::Trilogis.new(self)
 
-        # Register spatial types
-        register_spatial_types
-
         # Configure RGeo factory generator for SRID-based factory selection
         configure_rgeo_factory_generator
       end
@@ -138,6 +135,11 @@ module ActiveRecord
         Trilogis::SchemaCreation.new(self)
       end
 
+      # Override valid_type? to include spatial types
+      def valid_type?(type)
+        SPATIAL_COLUMN_TYPES.include?(type.to_s) || super
+      end
+
       def native_database_types
         super.merge(
           geometry: { name: "geometry" },
@@ -188,16 +190,6 @@ module ActiveRecord
 
       private
 
-      def register_spatial_types
-        SPATIAL_COLUMN_TYPES.each do |geo_type|
-          ActiveRecord::Type.register(
-            geo_type.to_sym,
-            Type::Spatial.new(geo_type),
-            adapter: :trilogis
-          )
-        end
-      end
-
       def configure_rgeo_factory_generator
         # Register Geographic factories for geographic SRIDs in RGeo::ActiveRecord::SpatialFactoryStore
         # This ensures the correct factory (Geographic vs Cartesian) is used based on SRID
@@ -264,6 +256,15 @@ module ActiveRecord
   end
 end
 
+# Register spatial types globally
+ActiveRecord::ConnectionAdapters::TrilogisAdapter::SPATIAL_COLUMN_TYPES.each do |geo_type|
+  ActiveRecord::Type.register(
+    geo_type.to_sym,
+    ActiveRecord::Type::Spatial,
+    adapter: :trilogis
+  )
+end
+
 # Register the adapter with ActiveRecord
 ActiveRecord::ConnectionAdapters.register(
   "trilogis",

data/lib/active_record/type/spatial.rb

@@ -244,8 +244,18 @@ module ActiveRecord
       end
 
       def spatial_factory
-        @spatial_factories ||= {}
+        # Rails 8.1 freezes type objects for Ractor compatibility
+        # If frozen, create factory without caching to avoid FrozenError
+        if frozen?
+          return RGeo::ActiveRecord::SpatialFactoryStore.instance.factory(
+            geo_type: @geo_type,
+            sql_type: @sql_type,
+            srid: @srid
+          )
+        end
 
+        # For non-frozen objects, use instance variable caching
+        @spatial_factories ||= {}
         @spatial_factories[@srid] ||= RGeo::ActiveRecord::SpatialFactoryStore.instance.factory(
           geo_type: @geo_type,
           sql_type: @sql_type,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-trilogis-adapter
 version: !ruby/object:Gem::Version
-  version: 8.0.0
+  version: 8.1.0
 platform: ruby
 authors:
 - Ether Moon
@@ -13,22 +13,16 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '8.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.0'
+        version: '8.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '8.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.0'
+        version: '8.1'
 - !ruby/object:Gem::Dependency
   name: rgeo
   requirement: !ruby/object:Gem::Requirement
@@ -49,14 +43,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '8.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '8.1'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -185,7 +179,7 @@ dependencies:
         version: '2.9'
 description: ActiveRecord connection adapter for MySQL. It extends the Rails built-in
   Trilogy adapter and adds spatial extensions support via RGeo. Compatible with Rails
-  8.0+ native Trilogy adapter. Requires Ruby 3.2+ and Rails 8.0+.
+  8.1+ native Trilogy adapter. Requires Ruby 3.2+ and Rails 8.1+.
 email: chipseru@gmail.com
 executables: []
 extensions: []