activerecord-trilogis-adapter 8.0.2 → 8.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c62868490c8dbbca1486797b7f451fe16da47e250d97d9578bc28bd405f88979
-  data.tar.gz: 53635558156147dadcf07913b4faeec937b0c8d1fd09548a82ac8168d10c3c45
+  metadata.gz: 1c43e31eb6d57d6b2eaf0ed551c13c729e1a7366e71f368871e358f262c6acac
+  data.tar.gz: 53488d879dd78083bc5671f5067a9b357a4f453213e2df373c9cf0e321542c6e
 SHA512:
-  metadata.gz: 12824854fd79269b2f00231712267db378e642579ea462a2aee7c1e377961ee65a0f03d2d47227484b9bfaa1800549fa2b207c7e8c5e29d9b1059b7deafed4bd
-  data.tar.gz: 1bb9c83957682886cb09eb343fe82ef2e9e9c2a4eb6998f01ecfe0d5c3c8a52659bfccd7344433260e1de3c66d15f8579ed2132286471fe9b9f235b042ef2b1e
+  metadata.gz: 384a3d95ec59d189d0615d2571498a0d7c7feff5f65862fd166f14d468eefd73c67fbc89072574b32aafebb1c36a79570f3221a8878f9b0272016a06f784eceb
+  data.tar.gz: d87c990d357629fb81929572fb4feedafae6dce63e7eb78be41552bc0d1f22f41a8ccc98c21327ac96060180d49349ad8a78fdb2b52b817d1f97c9243b10076a

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

@@ -12,11 +12,6 @@ module ActiveRecord
           if options[:srid]
             sql_result = "#{sql} /*!80003 SRID #{options[:srid]} */"
             sql.replace(sql_result)
-
-            # MySQL does not support DEFAULT values for spatial columns
-            # Remove :default option before calling super to prevent SQL errors
-            options = options.dup
-            options.delete(:default)
           end
 
           super

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

@@ -87,9 +87,8 @@ module ActiveRecord
             # Add NULL constraint
             sql_parts << " NOT NULL" if options[:null] == false
 
-            # MySQL does not support DEFAULT values for spatial/geometry columns
-            # Silently ignore :default option to prevent SQL syntax errors
-            # Users should handle defaults at application level instead
+            # Add DEFAULT if specified (allow falsy values like 0/false)
+            sql_parts << " DEFAULT #{quote_default_expression(options[:default], nil)}" if options.key?(:default)
 
             execute sql_parts.join
 
@@ -162,14 +161,23 @@ 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,
-            nil, # MySQL spatial columns cannot have DEFAULT values
+            cast_type,
+            extract_field_value(field, :Default, :default),
             type_metadata,
             extract_field_value(field, :Null, :null) == "YES",
-            nil, # MySQL spatial columns cannot have DEFAULT functions
+            extract_field_value(field, :Extra, :extra),
             collation: extract_field_value(field, :Collation, :collation),
             comment: extract_field_value(field, :Comment, :comment).presence,
             spatial_info: spatial_info
@@ -189,10 +197,7 @@ module ActiveRecord
             column_sql_parts << " SRID #{o.options[:srid]}" if o.options[:srid] && o.options[:srid] != 0
 
             column_sql_parts << " NOT NULL" unless o.null
-
-            # MySQL does not support DEFAULT values for spatial/geometry columns
-            # Silently ignore default to prevent SQL syntax errors
-
+            column_sql_parts << " DEFAULT #{quote_default_expression(o.default, o)}" unless o.default.nil?
             column_sql_parts.join
           else
             super

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

@@ -27,11 +27,13 @@ module ActiveRecord
           "geometrycollection" => RGeo::Feature::GeometryCollection
         }.freeze
 
-        def initialize(name, default, sql_type_metadata = nil, null = true,
+        def initialize(name, cast_type, 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)
+          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
@@ -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
 
@@ -83,26 +88,6 @@ module ActiveRecord
           # Type information is in the type() method
           { srid: @srid }.compact
         end
-
-        # Override default to always return nil for spatial columns
-        # MySQL does not support DEFAULT values for spatial/geometry columns
-        def default
-          return super unless spatial?
-
-          # Always return nil for spatial columns to prevent schema dumper
-          # from generating invalid DEFAULT clauses
-          nil
-        end
-
-        # Override default_function to always return nil for spatial columns
-        # MySQL does not support DEFAULT values for spatial/geometry columns
-        def default_function
-          return super unless spatial?
-
-          # Always return nil for spatial columns to prevent schema dumper
-          # from generating invalid DEFAULT clauses
-          nil
-        end
       end
     end
   end

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

@@ -3,7 +3,7 @@
 module ActiveRecord
   module ConnectionAdapters
     module Trilogis
-      VERSION = "8.0.2"
+      VERSION = "8.0.0"
     end
   end
 end

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.2
+  version: 8.1.0
 platform: ruby
 authors:
 - Ether Moon
@@ -15,14 +15,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: rgeo
   requirement: !ruby/object:Gem::Requirement
@@ -43,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
@@ -179,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: []