activerecord-postgis-adapter 8.0.3 → 11.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a24c165231e4b03b66bac3cc34446bc6683e960a7cfc5dd0e9cdc83aa9662b81
-  data.tar.gz: 1f8267c7469590eb14e12312e311e195c87504d3a1a64a9fe79392d50a9dab2f
+  metadata.gz: 211dbd4d62d434508e3f25601d469c70c5fcb4ffa5e75b5a1a197577df4b34cf
+  data.tar.gz: bb37b037a9acd972649f8ebdc47b9d041a8623ddf25d04cfa98c50c5f81fa2d4
 SHA512:
-  metadata.gz: 976f8ee3f628fcacffea4e7890f5c4f29d2308c3aa28bb070d7d547931767dce49438286f0be1dcb1424b9e3f38f5fb260f6c51750062755b0124416f5387064
-  data.tar.gz: 2012d45e2fb4603c11657a9a7d9a907d93e3202200eddc990bedd1a6a0e73680d9064838d248dabbc7c244d4c70ae461e49aa6c74adc96605abbf5b444eae0ba
+  metadata.gz: a7b2327ef909bf8917b38b829c6e8d6eea280ff552aa2926ec546f932dfd9eb0774ba79298fa8c72b5c43d67c7f1fb321d4006d986067ec9eb3299257eb9c578
+  data.tar.gz: 68df2184e5dc4e8dcc975dfa94e12a7b71ce6677a7d5462799e76c53c1737927e6c68f026eacc6aca54199df2b786b1aa97df2a45dfc68d7de540a879771bf72

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/quoting.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module ActiveRecord
+  module ConnectionAdapters
+    module PostGIS
+      module Quoting
+        def type_cast(value)
+          case value
+          when RGeo::Feature::Instance
+            value.to_s
+          else
+            super
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -7,8 +7,8 @@ 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)
-          column_name, type, default, notnull, oid, fmod, collation, comment, attgenerated = field
+        def new_column_from_field(table_name, field, _definitions)
+          column_name, type, default, notnull, oid, fmod, collation, comment, identity, attgenerated = field
           type_metadata = fetch_type_metadata(column_name, type, oid.to_i, fmod.to_i)
           default_value = extract_value_from_default(default)
 
@@ -18,7 +18,7 @@ module ActiveRecord
             default_function = extract_default_function(default_value, default)
           end
 
-          if match = default_function&.match(/\Anextval\('"?(?<sequence_name>.+_(?<suffix>seq\d*))"?'::regclass\)\z/)
+          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
 
@@ -35,6 +35,7 @@ module ActiveRecord
             comment: comment.presence,
             serial: serial,
             generated: attgenerated,
+            identity: identity.presence,
             spatial: spatial
           )
         end

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

@@ -9,7 +9,7 @@ module ActiveRecord  # :nodoc:
         #   "Geography(Point,4326)"
         def initialize(name, default, sql_type_metadata = nil, null = true,
                        default_function = nil, collation: nil, comment: nil,
-                       serial: nil, generated: nil, spatial: nil)
+                       serial: nil, generated: nil, spatial: nil, identity: nil)
           @sql_type_metadata = sql_type_metadata
           @geographic = !!(sql_type_metadata.sql_type =~ /geography\(/i)
           if spatial
@@ -31,7 +31,7 @@ module ActiveRecord  # :nodoc:
             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)
+                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

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.3"
+      VERSION = "11.0.0"
     end
   end
 end

data/lib/active_record/connection_adapters/postgis_adapter.rb

@@ -5,25 +5,23 @@
 
 # :stopdoc:
 
-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/quoting"
+require_relative "postgis/type" # has to be after oid/*
 # :startdoc:
 
 module ActiveRecord
+
   module ConnectionAdapters
     class PostGISAdapter < PostgreSQLAdapter
       ADAPTER_NAME = 'PostGIS'
@@ -45,6 +43,7 @@ module ActiveRecord
       # http://postgis.17.x6.nabble.com/Default-SRID-td5001115.html
       DEFAULT_SRID = 0
 
+      include PostGIS::Quoting
       include PostGIS::SchemaStatements
       include PostGIS::DatabaseStatements
 
@@ -163,23 +162,4 @@ module ActiveRecord
     spatial_ref_sys
     topology
   ]
-  Tasks::DatabaseTasks.register_task(/postgis/, "ActiveRecord::Tasks::PostgreSQLDatabaseTasks")
-end
-
-# if using JRUBY, create ArJdbc::PostGIS module
-# and prepend it to the PostgreSQL adapter since
-# it is the default adapter_spec.
-# see: https://github.com/jruby/activerecord-jdbc-adapter/blob/master/lib/arjdbc/postgresql/adapter.rb#27
-if RUBY_ENGINE == "jruby"
-  module ArJdbc
-    module PostGIS
-      ADAPTER_NAME = 'PostGIS'
-
-      def adapter_name
-        ADAPTER_NAME
-      end
-    end
-  end
-
-  ArJdbc::PostgreSQL.prepend(ArJdbc::PostGIS)
 end

data/lib/activerecord-postgis-adapter.rb

@@ -1,3 +1,7 @@
 # frozen_string_literal: true
 
-require "active_record/connection_adapters/postgis_adapter"
+require "active_record"
+require "active_record/connection_adapters"
+require "rgeo/active_record"
+ActiveRecord::ConnectionAdapters.register("postgis", "ActiveRecord::ConnectionAdapters::PostGISAdapter", "active_record/connection_adapters/postgis_adapter")
+ActiveRecord::Tasks::DatabaseTasks.register_task(/postgis/, "ActiveRecord::Tasks::PostgreSQLDatabaseTasks")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgis-adapter
 version: !ruby/object:Gem::Version
-  version: 8.0.3
+  version: 11.0.0
 platform: ruby
 authors:
 - Daniel Azuma
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-05 00:00:00.000000000 Z
+date: 2025-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 8.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 8.0.0
 - !ruby/object:Gem::Dependency
   name: rgeo-activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 8.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 8.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -68,33 +68,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.4'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: minitest-excludes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement
     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
@@ -113,9 +113,9 @@ description: ActiveRecord connection adapter for PostGIS. It is based on the sto
   PostgreSQL adapter, and adds built-in support for the spatial extensions provided
   by PostGIS. It uses the RGeo library to represent spatial data in Ruby.
 email:
-- dazuma@gmail.com
-- parhameter@gmail.com
 - kfdoggett@gmail.com
+- buonomo.ulysse@gmail.com
+- terminale@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -123,10 +123,10 @@ files:
 - LICENSE.txt
 - lib/active_record/connection_adapters/postgis/arel_tosql.rb
 - lib/active_record/connection_adapters/postgis/column_methods.rb
-- lib/active_record/connection_adapters/postgis/create_connection.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
@@ -139,6 +139,7 @@ homepage: http://github.com/rgeo/activerecord-postgis-adapter
 licenses:
 - BSD-3-Clause
 metadata:
+  funding_uri: https://opencollective.com/rgeo
   rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
@@ -148,14 +149,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.5.22
 signing_key: 
 specification_version: 4
 summary: ActiveRecord adapter for PostGIS, based on RGeo.

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

@@ -1,50 +0,0 @@
-# frozen_string_literal: true
-
-if RUBY_ENGINE == "jruby"
-  require "active_record/connection_adapters/jdbcpostgresql_adapter"
-else
-  require "pg"
-end
-
-module ActiveRecord  # :nodoc:
-  module ConnectionHandling  # :nodoc:
-    if RUBY_ENGINE == "jruby"
-
-      # modified from https://github.com/jruby/activerecord-jdbc-adapter/blob/master/lib/arjdbc/postgresql/connection_methods.rb#L3
-      def postgis_connection(config)
-        config = config.deep_dup
-        config = symbolize_keys_if_necessary(config)
-
-        config[:adapter_class] = ConnectionAdapters::PostGISAdapter
-        postgresql_connection(config)
-      end
-
-      alias_method :jdbcpostgis_connection, :postgis_connection
-
-    else
-
-      # Based on the default <tt>postgresql_connection</tt> definition from ActiveRecord.
-      # https://github.com/rails/rails/blob/master/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
-      # FULL REPLACEMENT because we need to create a different class.
-      def postgis_connection(config)
-        conn_params = config.symbolize_keys.compact
-
-        # Map ActiveRecords param names to PGs.
-        conn_params[:user] = conn_params.delete(:username) if conn_params[:username]
-        conn_params[:dbname] = conn_params.delete(:database) if conn_params[:database]
-
-        # Forward only valid config params to PG.connect
-        valid_conn_param_keys = PG::Connection.conndefaults_hash.keys + [:requiressl]
-        conn_params.slice!(*valid_conn_param_keys)
-
-        ConnectionAdapters::PostGISAdapter.new(
-          ConnectionAdapters::PostGISAdapter.new_client(conn_params),
-          logger,
-          conn_params,
-          config
-        )
-      end
-
-    end
-  end
-end