activerecord-postgis-adapter 8.0.2 → 9.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a73b6c9fb325971ec1f593c4698c12b68d8e9fd96e3af64f720d842f47f6c7d0
-  data.tar.gz: 52e0aa909ca3a69c74bcab5d6f0af4bd43f6610192a834743c632f803e17ce3c
+  metadata.gz: 9ce9132c84e82a73c22f3f9eba768333cd879f9a0672e3b77be63647166352f0
+  data.tar.gz: 2f9e5f0834f49116b23507f15742acd3979be5ab4c15e28271e0de7f07c9e1ef
 SHA512:
-  metadata.gz: 8b1f926834a893d07c9e09928ffbce2635906292a8dbad8f949df978f779c06841cd36b89ab0c160f5f2f197fffeb82907e2b24f18fd2dffd34b8184f9591bdf
-  data.tar.gz: 7da434681d9cfa4f120b76768d0bdab74724e3eca2928df1c4897c94ee7e6b1f8b2367c4a2213831b3a8943b3ac4759fc7de2c8583f422640835fcc2563efe68
+  metadata.gz: 0bb7874c27865181d37ba3e41ee58318445d39156d756c5ec1e8c372b350899f8478367fd205efbad21fb69a81caa6e78afaf964fce30e6269d3de96bac4fd3f
+  data.tar.gz: 3fe8d2306d02f7f2a1c6462c4326435ab1f6f111e366ead335c71c479170a3c5b528adc4178060895fdb1499a5feabe27e306257792bc8f40ee0d2cd9d376026

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

@@ -4,6 +4,7 @@ module ActiveRecord
   module ConnectionAdapters
     module PostGIS
       module ColumnMethods
+
         def spatial(name, options = {})
           raise "You must set a type. For example: 't.spatial type: :st_point'" unless options[:type]
           column(name, options[:type], **options)
@@ -44,6 +45,11 @@ module ActiveRecord
         def st_polygon(name, options = {})
           column(name, :st_polygon, **options)
         end
+
+        private
+        def valid_column_definition_options
+          super + [:srid, :has_z, :has_m, :geographic, :spatial_type]
+        end
       end
     end
 

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

@@ -25,7 +25,10 @@ module ActiveRecord
           #   has_z:    false
           #   has_m:    false
           def self.parse_sql_type(sql_type)
-            geo_type, srid, has_z, has_m = nil, 0, false, false
+            geo_type = nil
+            srid = 0
+            has_z = false
+            has_m = false
 
             if sql_type =~ /(geography|geometry)\((.*)\)$/i
               # geometry(Point)

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

@@ -7,13 +7,18 @@ module ActiveRecord
         # override
         # https://github.com/rails/rails/blob/7-0-stable/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb#L662
         # Create a SpatialColumn instead of a PostgreSQL::Column
-        def new_column_from_field(table_name, field)
+        def new_column_from_field(table_name, field, _definitions)
           column_name, type, default, notnull, oid, fmod, collation, comment, attgenerated = field
           type_metadata = fetch_type_metadata(column_name, type, oid.to_i, fmod.to_i)
           default_value = extract_value_from_default(default)
-          default_function = extract_default_function(default_value, default)
 
-          if match = default_function&.match(/\Anextval\('"?(?<sequence_name>.+_(?<suffix>seq\d*))"?'::regclass\)\z/)
+          if attgenerated.present?
+            default_function = default
+          else
+            default_function = 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]
           end
 

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

@@ -43,11 +43,11 @@ module ActiveRecord  # :nodoc:
           end
 
           def limit_from_options(type, options = {})
-            spatial_type = geo_type(type)
-            spatial_type << "Z" if options[:has_z]
-            spatial_type << "M" if options[:has_m]
-            spatial_type << ",#{options[:srid] || default_srid(options)}"
-            spatial_type
+            has_z = options[:has_z] ? 'Z' : ''
+            has_m = options[:has_m] ? 'M' : ''
+            srid = options[:srid] || default_srid(options)
+            field_type = [geo_type(type), has_z, has_m].compact.join
+            "#{field_type},#{srid}"
           end
 
           def default_srid(options)

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

@@ -3,7 +3,7 @@
 module ActiveRecord
   module ConnectionAdapters
     module PostGIS
-      VERSION = "8.0.2"
+      VERSION = "9.0.0"
     end
   end
 end

data/lib/active_record/connection_adapters/postgis_adapter.rb

@@ -9,18 +9,18 @@ require "rgeo/active_record"
 
 require "active_record/connection_adapters"
 require "active_record/connection_adapters/postgresql_adapter"
-require "active_record/connection_adapters/postgis/version"
-require "active_record/connection_adapters/postgis/column_methods"
-require "active_record/connection_adapters/postgis/schema_statements"
-require "active_record/connection_adapters/postgis/database_statements"
-require "active_record/connection_adapters/postgis/spatial_column_info"
-require "active_record/connection_adapters/postgis/spatial_table_definition"
-require "active_record/connection_adapters/postgis/spatial_column"
-require "active_record/connection_adapters/postgis/arel_tosql"
-require "active_record/connection_adapters/postgis/oid/spatial"
-require "active_record/connection_adapters/postgis/oid/date_time"
-require "active_record/connection_adapters/postgis/type" # has to be after oid/*
-require "active_record/connection_adapters/postgis/create_connection"
+require_relative "postgis/version"
+require_relative "postgis/column_methods"
+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/arel_tosql"
+require_relative "postgis/oid/spatial"
+require_relative "postgis/oid/date_time"
+require_relative "postgis/type" # has to be after oid/*
+require_relative "postgis/create_connection"
 # :startdoc:
 
 module ActiveRecord

data/lib/activerecord-postgis-adapter.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-require "active_record/connection_adapters/postgis_adapter"
+require_relative "active_record/connection_adapters/postgis_adapter"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgis-adapter
 version: !ruby/object:Gem::Version
-  version: 8.0.2
+  version: 9.0.0
 platform: ruby
 authors:
 - Daniel Azuma
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-16 00:00:00.000000000 Z
+date: 2023-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 7.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
   name: rgeo-activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -87,14 +87,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.1
+        version: '2.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.1
+        version: '2.12'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -148,7 +148,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="