activerecord-postgis-adapter 6.0.3 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69cf59b00676a1afdd07f0f6569b267995f5a5a3587fdf52a706876d5e4a1f87
-  data.tar.gz: d678ad7901ed89fae596ebfef4a48d2f04231a085da840c7fa2c4714f0aca534
+  metadata.gz: bb1e1b34ad600caf80e784c5ed95979d2712fe102d7845814d7258cec6605425
+  data.tar.gz: 6c9dcf403ec396a9482a9d88a02fd4282d6c9c50fbcc84d2581927f2bbf570d0
 SHA512:
-  metadata.gz: 355f65508295569307ac86dba4970477eb6d41f1f48484bb203a61ff31b7a3ec827b9eea321441c24a83f8706ceead8c916cb833947074b2463e8ffdf0060050
-  data.tar.gz: ea179ffdf8d4d31a0065001ae396e552732679c7048e48994ef503c8e8ff206e7aa2140f07ffe31f67be5a046f3ee679ba3e8d50e993f54a08512bf214ccceed
+  metadata.gz: be97e239ddd7b98c4b96616e456250c2ef624bf33517e02623d69ac1a4f94f64f46ecc1e0bf16afd5c036e36e6b3cba68f872ad261ebce44ef07a3b1661b21b5
+  data.tar.gz: 48d54259d8027b81ad8419bef0d66b1f73fa5145df8dd001bab340049b28c331bf7474f3614076b9de2f0626fc80a3da19cd1267519e9857b4f19d93008e416d

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

@@ -1,5 +1,23 @@
 # frozen_string_literal: true
 
+module RGeo
+  module ActiveRecord
+    ##
+    # Extend rgeo-activerecord visitors to use PostGIS specific functionality
+    module SpatialToPostGISSql
+      def visit_in_spatial_context(node, collector)
+        # Use ST_GeomFromEWKT for EWKT geometries
+        if node.is_a?(String) && node =~ /SRID=[\d+]{0,};/
+          collector << "#{st_func('ST_GeomFromEWKT')}(#{quote(node)})"
+        else
+          super(node, collector)
+        end
+      end
+    end
+  end
+end
+RGeo::ActiveRecord::SpatialToSql.prepend RGeo::ActiveRecord::SpatialToPostGISSql
+
 module Arel  # :nodoc:
   module Visitors  # :nodoc:
     # Different super-class under JRuby JDBC adapter.
@@ -11,22 +29,6 @@ module Arel  # :nodoc:
 
     class PostGIS < PostGISSuperclass  # :nodoc:
       include RGeo::ActiveRecord::SpatialToSql
-
-      FUNC_MAP = {
-        "st_wkttosql" => "ST_GeomFromEWKT",
-      }
-
-      def st_func(standard_name)
-        FUNC_MAP[standard_name.downcase] || standard_name
-      end
-
-      def visit_String(node, collector)
-        collector << "#{st_func('ST_WKTToSQL')}(#{quote(node)})"
-      end
-
-      def visit_RGeo_ActiveRecord_SpatialNamedFunction(node, collector)
-        aggregate(st_func(node.name), node, collector)
-      end
     end
   end
 end

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

@@ -23,9 +23,7 @@ module ActiveRecord  # :nodoc:
       # 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
-
-        conn_params.delete_if { |_, v| v.nil? }
+        conn_params = config.symbolize_keys.compact
 
         # Map ActiveRecords param names to PGs.
         conn_params[:user] = conn_params.delete(:username) if conn_params[:username]
@@ -35,14 +33,12 @@ module ActiveRecord  # :nodoc:
         valid_conn_param_keys = PG::Connection.conndefaults_hash.keys + [:requiressl]
         conn_params.slice!(*valid_conn_param_keys)
 
-        conn = PG.connect(conn_params)
-        ConnectionAdapters::PostGISAdapter.new(conn, logger, conn_params, config)
-      rescue ::PG::Error => error
-        if error.message.include?(conn_params[:dbname])
-          raise ActiveRecord::NoDatabaseError
-        else
-          raise
-        end
+        ConnectionAdapters::PostGISAdapter.new(
+          ConnectionAdapters::PostGISAdapter.new_client(conn_params),
+          logger,
+          conn_params,
+          config
+        )
       end
 
     end

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

@@ -49,11 +49,7 @@ module ActiveRecord
           def spatial_factory
             @spatial_factory ||=
               RGeo::ActiveRecord::SpatialFactoryStore.instance.factory(
-                geo_type: @geo_type,
-                has_m:    @has_m,
-                has_z:    @has_z,
-                sql_type: @sql_type,
-                srid:     @srid
+                factory_attrs
               )
           end
 
@@ -107,6 +103,16 @@ 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/postgis_database_tasks.rb

@@ -4,7 +4,7 @@ module ActiveRecord  # :nodoc:
   module ConnectionAdapters  # :nodoc:
     module PostGIS  # :nodoc:
       class PostGISDatabaseTasks < ::ActiveRecord::Tasks::PostgreSQLDatabaseTasks  # :nodoc:
-        def initialize(config)
+        def initialize(db_config)
           super
           ensure_installation_configs
         end
@@ -14,19 +14,19 @@ module ActiveRecord  # :nodoc:
           if extension_names
             setup_gis_from_extension
           end
-          establish_connection(configuration)
+          establish_connection(db_config)
         end
 
         # Override to set the database owner and call setup_gis
         def create(master_established = false)
           establish_master_connection unless master_established
-          extra_configs = { "encoding" => encoding }
-          extra_configs["owner"] = username if has_su?
-          connection.create_database(configuration["database"], configuration.merge(extra_configs))
+          extra_configs = { encoding: encoding }
+          extra_configs[:owner] = username if has_su?
+          connection.create_database(db_config.database, configuration_hash.merge(extra_configs))
           setup_gis
         rescue ::ActiveRecord::StatementInvalid => error
           if /database .* already exists/ === error.message
-            raise ::ActiveRecord::Tasks::DatabaseAlreadyExists
+            raise ::ActiveRecord::DatabaseAlreadyExists
           else
             raise
           end
@@ -36,24 +36,24 @@ module ActiveRecord  # :nodoc:
 
         # Override to use su_username and su_password
         def establish_master_connection
-          establish_connection(configuration.merge(
-            "database"           => "postgres",
-            "password"           => su_password,
-            "schema_search_path" => "public",
-            "username"           => su_username
+          establish_connection(configuration_hash.merge(
+            database:           "postgres",
+            password:           su_password,
+            schema_search_path: "public",
+            username:           su_username
           ))
         end
 
         def establish_su_connection
-          establish_connection(configuration.merge(
-            "password"           => su_password,
-            "schema_search_path" => "public",
-            "username"           => su_username
+          establish_connection(configuration_hash.merge(
+            password:           su_password,
+            schema_search_path: "public",
+            username:           su_username
           ))
         end
 
         def username
-          @username ||= configuration["username"]
+          @username ||= configuration_hash[:username]
         end
 
         def quoted_username
@@ -61,29 +61,30 @@ module ActiveRecord  # :nodoc:
         end
 
         def password
-          @password ||= configuration["password"]
+          @password ||= configuration_hash[:password]
         end
 
         def su_username
-          @su_username ||= configuration["su_username"] || username
+          @su_username ||= configuration_hash.fetch(:su_username, username)
         end
 
         def su_password
-          @su_password ||= configuration["su_password"] || password
+          @su_password ||= configuration_hash.fetch(:su_password, password)
         end
 
         def has_su?
-          @has_su = configuration.include?("su_username") unless defined?(@has_su)
-          @has_su
+          return @has_su if defined?(@has_su)
+
+          @has_su = configuration_hash.include?(:su_username)
         end
 
         def search_path
-          @search_path ||= configuration["schema_search_path"].to_s.strip.split(",").map(&:strip)
+          @search_path ||= configuration_hash[:schema_search_path].to_s.strip.split(",").map(&:strip)
         end
 
         def extension_names
           @extension_names ||= begin
-            extensions = configuration["postgis_extension"]
+            extensions = configuration_hash[:postgis_extension]
             case extensions
             when ::String
               extensions.split(",")
@@ -96,11 +97,11 @@ module ActiveRecord  # :nodoc:
         end
 
         def ensure_installation_configs
-          if configuration["setup"] == "default" && !configuration["postgis_extension"]
+          if configuration_hash[:setup] == "default" && !configuration_hash[:postgis_extension]
             share_dir = `pg_config --sharedir`.strip rescue "/usr/share"
             control_file = ::File.expand_path("extension/postgis.control", share_dir)
             if ::File.readable?(control_file)
-              configuration["postgis_extension"] = "postgis"
+              @configuration_hash = configuration_hash.merge(postgis_extension: "postgis").freeze
             end
           end
         end
@@ -113,7 +114,7 @@ module ActiveRecord  # :nodoc:
               end
               connection.execute("CREATE EXTENSION IF NOT EXISTS #{extname} SCHEMA topology")
             else
-              if (postgis_schema = configuration["postgis_schema"])
+              if (postgis_schema = configuration_hash[:postgis_schema])
                 schema_clause = "WITH SCHEMA #{postgis_schema}"
                 unless schema_exists?(postgis_schema)
                   connection.execute("CREATE SCHEMA #{postgis_schema}")

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

@@ -3,7 +3,7 @@
 module ActiveRecord
   module ConnectionAdapters
     module PostGIS
-      VERSION = "6.0.3"
+      VERSION = "7.0.0"
     end
   end
 end

data/lib/active_record/connection_adapters/postgis_adapter.rb

@@ -7,18 +7,11 @@
 
 require "rgeo/active_record"
 
-# autoload AbstractAdapter to avoid circular require and void context warnings
-module ActiveRecord
-  module ConnectionAdapters
-    AbstractAdapter
-  end
-end
-
+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"
@@ -39,7 +32,7 @@ end
 module ActiveRecord
   module ConnectionAdapters
     class PostGISAdapter < PostgreSQLAdapter
-      ADAPTER_NAME = 'PostGIS'
+      ADAPTER_NAME = 'PostGIS'.freeze
 
       SPATIAL_COLUMN_OPTIONS =
         {
@@ -59,7 +52,6 @@ module ActiveRecord
       DEFAULT_SRID = 0
 
       include PostGIS::SchemaStatements
-      include PostGIS::DatabaseStatements
 
       def arel_visitor # :nodoc:
         Arel::Visitors::PostGIS.new(self)
@@ -95,32 +87,6 @@ module ActiveRecord
           super
         end
       end
-
-      def quote_default_expression(value, column)
-        if column.type == :geography || column.type == :geometry
-          quote(value)
-        else
-          super
-        end
-      end
-    end
-  end
-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/60-stable/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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgis-adapter
 version: !ruby/object:Gem::Version
-  version: 6.0.3
+  version: 7.0.0
 platform: ruby
 authors:
 - Daniel Azuma
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-17 00:00:00.000000000 Z
+date: 2021-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,42 +17,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: rgeo-activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -110,7 +110,6 @@ files:
 - 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/databases.rake
 - lib/active_record/connection_adapters/postgis/oid/spatial.rb
 - lib/active_record/connection_adapters/postgis/postgis_database_tasks.rb
@@ -142,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: ActiveRecord adapter for PostGIS, based on RGeo.

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

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveRecord
-  module ConnectionAdapters # :nodoc:
-    module PostGIS
-      module DatabaseStatements
-        def truncate_tables(*table_names)
-          table_names -= ["spatial_ref_sys"]
-          super(*table_names)
-        end
-      end
-    end
-  end
-end