activerecord-postgis-adapter 10.0.1 → 11.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c89079951de976b3c0909194bfc5c19e7788f6002ac72851c4ad42606ffea8fd
-  data.tar.gz: ab2b792b1bb948cd59cf7fcfccb447ac833c5cbae9d12b7a8822295b94c4cf65
+  metadata.gz: d477a971bc892e6bafc575dc82dd5af7b007b0f8755b2b27a7d4adabfea7261f
+  data.tar.gz: 61f5cb02bde912292f92f8c416ae64e22442f35ba466074ffc3466625501d638
 SHA512:
-  metadata.gz: b8399daa6d86e1871e1de81442f9fa059ed8667bf809429f3fd43b58fe7957c87d882322346ca808f7062acd1cebf63fbd2fe5507316de0fc1cefaec2b039523
-  data.tar.gz: 9939e9d954d8d9c0aeb10c13641507819028c8f9b5d57e2db66fd50dff058773eda3c13f40c4ee28e75cd26e0c9fb6f4e39982f0dcadfe12d82ad88a9b9f34a0
+  metadata.gz: 4864a98aa11734fffa2c7f0cd81049c81004a0bc19c6912c6c05c73457a4f0ab4dfd18de3960a3108dd31c0a2b0acbee36cdc5e0280b1551f632a60b0596c5da
+  data.tar.gz: 9fea7a830019c327036b974e4fd4c1cdede785834f3dc791cbc323bb05320f5273365de176b778b19d7c421b23ed1c3aec928fbd6e42f5779f3f01e4ca055380

data/lib/active_record/connection_adapters/postgis/{spatial_column.rb → column.rb}

@@ -3,14 +3,15 @@
 module ActiveRecord  # :nodoc:
   module ConnectionAdapters  # :nodoc:
     module PostGIS  # :nodoc:
-      class SpatialColumn < ConnectionAdapters::PostgreSQLColumn  # :nodoc:
+      class Column < PostgreSQL::Column  # :nodoc:
         # sql_type examples:
         #   "Geometry(Point,4326)"
         #   "Geography(Point,4326)"
-        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,
                        serial: nil, generated: nil, spatial: nil, identity: nil)
-          @sql_type_metadata = sql_type_metadata
+          super(name, cast_type, default, sql_type_metadata, null, default_function,
+                collation: collation, comment: comment, serial: serial, generated: generated, identity: identity)
           @geographic = !!(sql_type_metadata.sql_type =~ /geography\(/i)
           if spatial
             # This case comes from an entry in the geometry_columns table
@@ -30,8 +31,6 @@ module ActiveRecord  # :nodoc:
             # @geometric_type = geo_type_from_sql_type(sql_type)
             build_from_sql_type(sql_type_metadata.sql_type)
           end
-          super(name, default, sql_type_metadata, null, default_function,
-                collation: collation, comment: comment, serial: serial, generated: generated, identity: identity)
           if spatial? && @srid
             @limit = { srid: @srid, type: to_type_name(geometric_type) }
             @limit[:has_z] = true if @has_z
@@ -58,6 +57,49 @@ module ActiveRecord  # :nodoc:
           %i[geometry geography].include?(@sql_type_metadata.type)
         end
 
+        def init_with(coder)
+          @geographic = coder["geographic"]
+          @geometric_type = coder["geometric_type"]
+          @has_m = coder["has_m"]
+          @has_z = coder["has_z"]
+          @srid = coder["srid"]
+          @limit = coder["limit"]
+          super
+        end
+
+        def encode_with(coder)
+          coder["geographic"] = @geographic
+          coder["geometric_type"] = @geometric_type
+          coder["has_m"] = @has_m
+          coder["has_z"] = @has_z
+          coder["srid"] = @srid
+          coder["limit"] = @limit
+          super
+        end
+
+        def ==(other)
+          other.is_a?(Column) &&
+            super &&
+            other.geographic == geographic &&
+            other.geometric_type == geometric_type &&
+            other.has_m == has_m &&
+            other.has_z == has_z &&
+            other.srid == srid &&
+            other.limit == limit
+        end
+         alias :eql? :==
+
+         def hash
+           Column.hash ^
+             super.hash ^
+             geographic.hash ^
+             geometric_type.hash ^
+             has_m.hash ^
+             has_z.hash ^
+             srid.hash ^
+             limit.hash
+         end
+
         private
 
         def set_geometric_type_from_name(name)

data/lib/active_record/connection_adapters/postgis/oid/spatial.rb

@@ -10,12 +10,17 @@ module ActiveRecord
         # Responsible for parsing sql_types returned from the database and WKT features.
         class Spatial < Type::Value
           def initialize(geo_type: "geometry", srid: 0, has_z: false, has_m: false, geographic: false)
-            @geo_type = geo_type
-            @srid = srid
-            @has_z = has_z
-            @has_m = has_m
-            @geographic = geographic
+            super()
+            @geographic = geographic.freeze
+            @factory_attrs = {
+              geo_type: geo_type.underscore.freeze,
+              has_m: has_m.freeze,
+              has_z: has_z.freeze,
+              srid: srid.freeze,
+              sql_type: type.to_s.freeze
+            }.freeze
           end
+          protected attr_reader :geographic, :factory_attrs
 
           # sql_type: geometry, geometry(Point), geometry(Point,4326), ...
           #
@@ -53,10 +58,9 @@ module ActiveRecord
           end
 
           def spatial_factory
-            @spatial_factory ||=
-              RGeo::ActiveRecord::SpatialFactoryStore.instance.factory(
-                factory_attrs
-              )
+            RGeo::ActiveRecord::SpatialFactoryStore.instance.factory(
+              factory_attrs
+            )
           end
 
           def spatial?
@@ -80,6 +84,17 @@ module ActiveRecord
                                      .generate(geo_value)
           end
 
+          def ==(other)
+            super &&
+              @geographic == other.geographic &&
+              @factory_attrs == other.factory_attrs
+          end
+          alias eql? ==
+
+          def hash
+            super ^ [@geographic, @factory_attrs].hash
+          end
+
           private
 
           def cast_value(value)
@@ -105,16 +120,6 @@ module ActiveRecord
               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
-            }
-          end
         end
       end
     end

data/lib/active_record/connection_adapters/postgis/quoting.rb

@@ -12,6 +12,21 @@ module ActiveRecord
             super
           end
         end
+
+        # NOTE: This method should be private in future rails versions.
+        #   Hence we should also make it private then.
+        #
+        # See https://github.com/rails/rails/blob/v8.1.1/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb#L190
+        def lookup_cast_type(sql_type)
+          type_map.lookup(
+            # oid
+            query_value("SELECT #{quote(sql_type)}::regtype::oid", "SCHEMA").to_i,
+            # fmod, not needed.
+            nil,
+            # details needed for `..::PostGIS::OID::Spatial` (e.g. `geometry(point,3857)`)
+            sql_type
+          )
+        end
       end
     end
   end

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

@@ -12,11 +12,11 @@ module ActiveRecord
           type_metadata = fetch_type_metadata(column_name, type, oid.to_i, fmod.to_i)
           default_value = extract_value_from_default(default)
 
-          if attgenerated.present?
-            default_function = default
-          else
-            default_function = extract_default_function(default_value, default)
-          end
+          default_function = if attgenerated.present?
+                               default
+                             else
+                               extract_default_function(default_value, default)
+                             end
 
           if (match = default_function&.match(/\Anextval\('"?(?<sequence_name>.+_(?<suffix>seq\d*))"?'::regclass\)\z/))
             serial = sequence_name_from_parts(table_name, column_name, match[:suffix]) == match[:sequence_name]
@@ -25,8 +25,9 @@ module ActiveRecord
           # {:dimension=>2, :has_m=>false, :has_z=>false, :name=>"latlon", :srid=>0, :type=>"GEOMETRY"}
           spatial = spatial_column_info(table_name).get(column_name, type_metadata.sql_type)
 
-          SpatialColumn.new(
+          Column.new(
             column_name,
+            get_oid_type(oid.to_i, fmod.to_i, column_name, type),
             default_value,
             type_metadata,
             !notnull,
@@ -50,6 +51,11 @@ module ActiveRecord
           @spatial_column_info ||= {}
           @spatial_column_info[table_name.to_sym] ||= SpatialColumnInfo.new(self, table_name.to_s)
         end
+
+        # Returns an array of view names defined in the database.
+        def views
+          super - %w[geography_columns geometry_columns]
+        end
       end
     end
   end

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

@@ -3,7 +3,7 @@
 module ActiveRecord
   module ConnectionAdapters
     module PostGIS
-      VERSION = "10.0.1"
+      VERSION = "11.1.0"
     end
   end
 end

data/lib/active_record/connection_adapters/postgis_adapter.rb

@@ -12,7 +12,7 @@ require_relative "postgis/schema_statements"
 require_relative "postgis/database_statements"
 require_relative "postgis/spatial_column_info"
 require_relative "postgis/spatial_table_definition"
-require_relative "postgis/spatial_column"
+require_relative "postgis/column"
 require_relative "postgis/arel_tosql"
 require_relative "postgis/oid/spatial"
 require_relative "postgis/oid/date_time"
@@ -84,7 +84,7 @@ module ActiveRecord
               #   "geometry(Polygon,4326) NOT NULL"
               #   "geometry(Geography,4326)"
               geo_type, srid, has_z, has_m, geographic = PostGIS::OID::Spatial.parse_sql_type(sql_type)
-              PostGIS::OID::Spatial.new(geo_type: geo_type, srid: srid, has_z: has_z, has_m: has_m, geographic: geographic)
+              PostGIS::OID::Spatial.new(geo_type: geo_type, srid: srid, has_z: has_z, has_m: has_m, geographic: geographic).freeze
             end
           end
 
@@ -92,9 +92,7 @@ module ActiveRecord
         end
 
         def native_database_types
-          @native_database_types ||= begin
-            default_types = PostgreSQLAdapter.native_database_types
-            default_types.merge({
+          @native_database_types ||= super.merge({
               geography:           { name: "geography" },
               geometry:            { name: "geometry" },
               geometry_collection: { name: "geometry_collection" },
@@ -106,7 +104,6 @@ module ActiveRecord
               st_point:            { name: "st_point" },
               st_polygon:          { name: "st_polygon" }
             })
-          end
         end
       end
 

data/lib/active_record/relation/query_methods_ext.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module ActiveRecord
+  class Relation
+    module QueryMethodsExt
+      def st_contains!(column, inner_geom)
+      	where!(self.arel_table[:column].st_contains(inner_geom))
+      end
+
+      def st_contains(...)
+      	spawn.st_contains!(...)
+      end
+
+      RGeo::ActiveRecord::SpatialExpressions.instance_methods.each do |method_name|
+      	next if method_name == :st_function
+      	met = RGeo::ActiveRecord::SpatialExpressions.instance_method(method_name)
+        class_eval(<<-CODE, __FILE__, __LINE__ + 1)
+          def #{method_name}(...); #{method_name}!(...); end
+          def #{method_name}!(column, *args)
+          	rel = self.arel_table[column]
+          	where!(rel.#{method_name}(*args))
+          end
+        CODE
+      end
+    end
+
+    QueryMethods.prepend(QueryMethodsExt)
+  end
+  # `ActiveRecord::Base` ancestors do not include `QueryMethods`.
+  # But the `#all` method returns a relation, which has `QueryMethods`
+  # as ancestor. That is how active_record is doing is as well.
+  #
+  # @see https://github.com/rails/rails/blob/914130a9f/activerecord/lib/active_record/querying.rb#L23
+  Querying.delegate(:st_contains, to: :all)
+end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgis-adapter
 version: !ruby/object:Gem::Version
-  version: 10.0.1
+  version: 11.1.0
 platform: ruby
 authors:
 - Daniel Azuma
 - Tee Parham
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-15 00:00:00.000000000 Z
+date: 2025-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.2.0
+        version: 8.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.2.0
+        version: 8.1.0
 - !ruby/object:Gem::Dependency
   name: rgeo-activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 8.0.0
+        version: 8.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 8.0.0
+        version: 8.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -122,18 +121,19 @@ extra_rdoc_files: []
 files:
 - LICENSE.txt
 - lib/active_record/connection_adapters/postgis/arel_tosql.rb
+- lib/active_record/connection_adapters/postgis/column.rb
 - lib/active_record/connection_adapters/postgis/column_methods.rb
 - lib/active_record/connection_adapters/postgis/database_statements.rb
 - lib/active_record/connection_adapters/postgis/oid/date_time.rb
 - lib/active_record/connection_adapters/postgis/oid/spatial.rb
 - lib/active_record/connection_adapters/postgis/quoting.rb
 - lib/active_record/connection_adapters/postgis/schema_statements.rb
-- lib/active_record/connection_adapters/postgis/spatial_column.rb
 - lib/active_record/connection_adapters/postgis/spatial_column_info.rb
 - lib/active_record/connection_adapters/postgis/spatial_table_definition.rb
 - lib/active_record/connection_adapters/postgis/type.rb
 - lib/active_record/connection_adapters/postgis/version.rb
 - lib/active_record/connection_adapters/postgis_adapter.rb
+- lib/active_record/relation/query_methods_ext.rb
 - lib/activerecord-postgis-adapter.rb
 homepage: http://github.com/rgeo/activerecord-postgis-adapter
 licenses:
@@ -141,7 +141,6 @@ licenses:
 metadata:
   funding_uri: https://opencollective.com/rgeo
   rubygems_mfa_required: 'true'
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -149,15 +148,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key: 
+rubygems_version: 3.6.4
 specification_version: 4
 summary: ActiveRecord adapter for PostGIS, based on RGeo.
 test_files: []