activerecord-postgis-adapter 9.0.2 → 10.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75f6e9775eb5ed72bf5afd83bb6c987da46b6ac05db7ea61e8930565010b5874
-  data.tar.gz: f656e5b00c0920b2b8a2373de6501a048991498a6592338ca73d4a2e7d73df04
+  metadata.gz: c89079951de976b3c0909194bfc5c19e7788f6002ac72851c4ad42606ffea8fd
+  data.tar.gz: ab2b792b1bb948cd59cf7fcfccb447ac833c5cbae9d12b7a8822295b94c4cf65
 SHA512:
-  metadata.gz: 489c286442008acd662c8b8c3cbeae6351e76b65547bb5559f7697eeccf30f910b635cff3884981499abfdb7bb028a740a1ff987e85d68adb635ff3b49920c73
-  data.tar.gz: 0a5122a68aa81d656822b04327848350c99529eb7f811d116a9bfb9a31b90b0028fe33ad80961acbc2429a5a84e9dd704df3a081c05f495564cd250dc70d2156
+  metadata.gz: b8399daa6d86e1871e1de81442f9fa059ed8667bf809429f3fd43b58fe7957c87d882322346ca808f7062acd1cebf63fbd2fe5507316de0fc1cefaec2b039523
+  data.tar.gz: 9939e9d954d8d9c0aeb10c13641507819028c8f9b5d57e2db66fd50dff058773eda3c13f40c4ee28e75cd26e0c9fb6f4e39982f0dcadfe12d82ad88a9b9f34a0

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

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

data/lib/active_record/connection_adapters/postgis_adapter.rb

@@ -5,9 +5,6 @@
 
 # :stopdoc:
 
-require "rgeo/active_record"
-
-require "active_record/connection_adapters"
 require "active_record/connection_adapters/postgresql_adapter"
 require_relative "postgis/version"
 require_relative "postgis/column_methods"
@@ -19,20 +16,11 @@ 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/*
-require_relative "postgis/create_connection"
 # :startdoc:
 
 module ActiveRecord
-  module ConnectionHandling # :nodoc:
-    def postgis_adapter_class
-      ConnectionAdapters::PostGISAdapter
-    end
-
-    def postgis_connection(config)
-      postgis_adapter_class.new(config)
-    end
-  end
 
   module ConnectionAdapters
     class PostGISAdapter < PostgreSQLAdapter
@@ -55,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
 
@@ -173,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_relative "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: 9.0.2
+  version: 10.0.1
 platform: ruby
 authors:
 - Daniel Azuma
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-30 00:00:00.000000000 Z
+date: 2024-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.2.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,19 +68,19 @@ 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
@@ -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,7 +149,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

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