activerecord-postgis-adapter 7.0.0 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb1e1b34ad600caf80e784c5ed95979d2712fe102d7845814d7258cec6605425
-  data.tar.gz: 6c9dcf403ec396a9482a9d88a02fd4282d6c9c50fbcc84d2581927f2bbf570d0
+  metadata.gz: 88b08c026151d4f1a930e5fc3299bbf1898a20df441f86b57cde0aabcd29b4cb
+  data.tar.gz: 823b5b9511687fa663273242d5cce9d490610b813df495ad81b43c241c3b443e
 SHA512:
-  metadata.gz: be97e239ddd7b98c4b96616e456250c2ef624bf33517e02623d69ac1a4f94f64f46ecc1e0bf16afd5c036e36e6b3cba68f872ad261ebce44ef07a3b1661b21b5
-  data.tar.gz: 48d54259d8027b81ad8419bef0d66b1f73fa5145df8dd001bab340049b28c331bf7474f3614076b9de2f0626fc80a3da19cd1267519e9857b4f19d93008e416d
+  metadata.gz: f851b74ce6e9da1a4aac3bfcf8acbda44e563f049de04eaf832a8b49cf2acc41cf98495a9ff123786d9bd871658d97637453ae6d845e55f0bf4f5074db01eab7
+  data.tar.gz: 7e47c25711cf8ee49c62a8ad89f9d0b0e5525bf4fb1b45ddb185db6477d0e114a4868a50c612e9a51e880499213cb6cb82f051adf993618eb0978cc0d0f45dc7

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

@@ -10,7 +10,11 @@ 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

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

@@ -0,0 +1,14 @@
+# 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

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

@@ -4,16 +4,17 @@ module ActiveRecord
   module ConnectionAdapters
     module PostGIS
       module OID
+        # OID used to represent geometry/geography database types and attributes.
+        #
+        # Accepts `geo_type`, `srid`, `has_z`, `has_m`, and `geographic` as parameters.
+        # Responsible for parsing sql_types returned from the database and WKT features.
         class Spatial < Type::Value
-          # sql_type is a string that comes from the database definition
-          # examples:
-          #   "geometry(Point,4326)"
-          #   "geography(Point,4326)"
-          #   "geometry(Polygon,4326) NOT NULL"
-          #   "geometry(Geography,4326)"
-          def initialize(oid, sql_type)
-            @sql_type = sql_type
-            @geo_type, @srid, @has_z, @has_m = self.class.parse_sql_type(sql_type)
+          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
           end
 
           # sql_type: geometry, geometry(Point), geometry(Point,4326), ...
@@ -43,7 +44,9 @@ module ActiveRecord
               # otherType(a,b)
               geo_type = sql_type
             end
-            [geo_type, srid, has_z, has_m]
+            geographic = sql_type.match?(/geography/)
+
+            [geo_type, srid, has_z, has_m, geographic]
           end
 
           def spatial_factory
@@ -53,16 +56,12 @@ module ActiveRecord
               )
           end
 
-          def geographic?
-            @sql_type =~ /geography/
-          end
-
           def spatial?
             true
           end
 
           def type
-            geographic? ? :geography : :geometry
+            @geographic ? :geography : :geometry
           end
 
           # support setting an RGeo object or a WKT string

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

@@ -83,26 +83,6 @@ module ActiveRecord
           @spatial_column_info ||= {}
           @spatial_column_info[table_name.to_sym] ||= SpatialColumnInfo.new(self, table_name.to_s)
         end
-
-        def initialize_type_map(map = type_map)
-          %w(
-            geography
-            geometry
-            geometry_collection
-            line_string
-            multi_line_string
-            multi_point
-            multi_polygon
-            st_point
-            st_polygon
-          ).each do |geo_type|
-            map.register_type(geo_type) do |oid, _, sql_type|
-              OID::Spatial.new(oid, sql_type)
-            end
-          end
-
-          super
-        end
       end
     end
   end

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

@@ -32,13 +32,11 @@ module ActiveRecord  # :nodoc:
           end
           super(name, default, sql_type_metadata, null, default_function,
                 collation: collation, comment: comment, serial: serial)
-          if spatial?
-            if @srid
-              @limit = { srid: @srid, type: to_type_name(geometric_type) }
-              @limit[:has_z] = true if @has_z
-              @limit[:has_m] = true if @has_m
-              @limit[:geographic] = true if @geographic
-            end
+          if spatial? && @srid
+            @limit = { srid: @srid, type: to_type_name(geometric_type) }
+            @limit[:has_z] = true if @has_z
+            @limit[:has_m] = true if @has_m
+            @limit[:geographic] = true if @geographic
           end
         end
 
@@ -67,15 +65,16 @@ module ActiveRecord  # :nodoc:
         end
 
         def build_from_sql_type(sql_type)
-          geo_type, @srid, @has_z, @has_m = OID::Spatial.parse_sql_type(sql_type)
+          geo_type, @srid, @has_z, @has_m, @geographic = OID::Spatial.parse_sql_type(sql_type)
           set_geometric_type_from_name(geo_type)
         end
 
         def to_type_name(geometric_type)
           name = geometric_type.type_name.underscore
-          if name == "point"
+          case name
+          when "point"
             "st_point"
-          elsif name == "polygon"
+          when "polygon"
             "st_polygon"
           else
             name

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

@@ -21,7 +21,7 @@ module ActiveRecord  # :nodoc:
             dimension = row[1].to_i
             has_m = !!(type =~ /m$/i)
             type.sub!(/m$/, "")
-            has_z = dimension > 3 || dimension == 3 && !has_m
+            has_z = dimension > 3 || (dimension == 3 && !has_m)
             result[name] = {
               dimension: dimension,
               has_m:     has_m,

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

@@ -9,8 +9,8 @@ module ActiveRecord  # :nodoc:
         # super: https://github.com/rails/rails/blob/master/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
         def new_column_definition(name, type, **options)
           if (info = PostGISAdapter.spatial_column_options(type.to_sym))
-            if (limit = options.delete(:limit))
-              options.merge!(limit) if limit.is_a?(::Hash)
+            if (limit = options.delete(:limit)) && limit.is_a?(::Hash)
+              options.merge!(limit)
             end
 
             geo_type = ColumnDefinitionUtils.geo_type(options[:type] || type || info[:type])

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module ActiveRecord
+  module ConnectionAdapters
+    module PostGIS
+      module Type
+        # Look for :postgis types first, then check for :postgresql
+        # types to simulate a kind of Type inheritance.
+        def lookup(*args, adapter: current_adapter_name, **kwargs)
+          super(*args, adapter: adapter, **kwargs)
+        rescue ArgumentError => e
+          raise e unless current_adapter_name == :postgis
+
+          super(*args, adapter: :postgresql, **kwargs)
+        end
+      end
+    end
+  end
+
+  # Type uses `class << self` syntax so we have to prepend to the singleton_class
+  Type.singleton_class.prepend(ActiveRecord::ConnectionAdapters::PostGIS::Type)
+end

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

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

data/lib/active_record/connection_adapters/postgis_adapter.rb

@@ -12,27 +12,20 @@ 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/setup"
 require "active_record/connection_adapters/postgis/oid/spatial"
+require "active_record/connection_adapters/postgis/type" # has to be after oid/*
 require "active_record/connection_adapters/postgis/create_connection"
-require "active_record/connection_adapters/postgis/postgis_database_tasks"
-
-ActiveRecord::ConnectionAdapters::PostGIS.initial_setup
-
-if defined?(Rails::Railtie)
-  require "active_record/connection_adapters/postgis/railtie"
-end
-
 # :startdoc:
 
 module ActiveRecord
   module ConnectionAdapters
     class PostGISAdapter < PostgreSQLAdapter
-      ADAPTER_NAME = 'PostGIS'.freeze
+      ADAPTER_NAME = 'PostGIS'
 
       SPATIAL_COLUMN_OPTIONS =
         {
@@ -52,6 +45,7 @@ module ActiveRecord
       DEFAULT_SRID = 0
 
       include PostGIS::SchemaStatements
+      include PostGIS::DatabaseStatements
 
       def arel_visitor # :nodoc:
         Arel::Visitors::PostGIS.new(self)
@@ -69,6 +63,35 @@ module ActiveRecord
         DEFAULT_SRID
       end
 
+      class << self
+        def initialize_type_map(map = type_map)
+          %w[
+            geography
+            geometry
+            geometry_collection
+            line_string
+            multi_line_string
+            multi_point
+            multi_polygon
+            st_point
+            st_polygon
+          ].each do |geo_type|
+            map.register_type(geo_type) do |_, _, sql_type|
+              # sql_type is a string that comes from the database definition
+              # examples:
+              #   "geometry(Point,4326)"
+              #   "geography(Point,4326)"
+              #   "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)
+            end
+          end
+
+          super
+        end
+      end
+
       def srs_database_columns
         {
           auth_name_column: "auth_name",
@@ -87,6 +110,57 @@ module ActiveRecord
           super
         end
       end
+
+      def quote_default_expression(value, column)
+        if column.type == :geography || column.type == :geometry
+          quote(value)
+        else
+          super
+        end
+      end
+
+      # PostGIS specific types
+      [
+        :geography,
+        :geometry,
+        :geometry_collection,
+        :line_string,
+        :multi_line_string,
+        :multi_point,
+        :multi_polygon,
+        :st_point,
+        :st_polygon,
+      ].each do |geo_type|
+        ActiveRecord::Type.register(geo_type, PostGIS::OID::Spatial, adapter: :postgis)
+      end
     end
   end
+  SchemaDumper.ignore_tables |= %w[
+    geography_columns
+    geometry_columns
+    layer
+    raster_columns
+    raster_overviews
+    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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgis-adapter
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 8.0.0
 platform: ruby
 authors:
 - Daniel Azuma
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-05 00:00:00.000000000 Z
+date: 2022-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
   name: rgeo-activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -81,20 +81,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 description: ActiveRecord connection adapter for PostGIS. It is based on the stock
   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.
@@ -110,22 +96,21 @@ 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/databases.rake
+- lib/active_record/connection_adapters/postgis/database_statements.rb
 - lib/active_record/connection_adapters/postgis/oid/spatial.rb
-- lib/active_record/connection_adapters/postgis/postgis_database_tasks.rb
-- lib/active_record/connection_adapters/postgis/railtie.rb
 - lib/active_record/connection_adapters/postgis/schema_statements.rb
-- lib/active_record/connection_adapters/postgis/setup.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/activerecord-postgis-adapter.rb
 homepage: http://github.com/rgeo/activerecord-postgis-adapter
 licenses:
 - BSD-3-Clause
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -134,14 +119,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: ActiveRecord adapter for PostGIS, based on RGeo.

data/lib/active_record/connection_adapters/postgis/databases.rake

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-namespace :db do
-  namespace :gis do
-    desc "Setup PostGIS data in the database"
-    task setup: [:load_config] do
-      environments = [Rails.env]
-      environments << "test" if Rails.env.development?
-      environments.each do |environment|
-        ActiveRecord::Base.configurations
-          .configs_for(env_name: environment)
-          .reject { |env| env.config["database"].blank? }
-          .each do |env|
-            ActiveRecord::ConnectionAdapters::PostGIS::PostGISDatabaseTasks.new(env.config).setup_gis
-          end
-      end
-    end
-  end
-end

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

@@ -1,142 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveRecord  # :nodoc:
-  module ConnectionAdapters  # :nodoc:
-    module PostGIS  # :nodoc:
-      class PostGISDatabaseTasks < ::ActiveRecord::Tasks::PostgreSQLDatabaseTasks  # :nodoc:
-        def initialize(db_config)
-          super
-          ensure_installation_configs
-        end
-
-        def setup_gis
-          establish_su_connection
-          if extension_names
-            setup_gis_from_extension
-          end
-          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(db_config.database, configuration_hash.merge(extra_configs))
-          setup_gis
-        rescue ::ActiveRecord::StatementInvalid => error
-          if /database .* already exists/ === error.message
-            raise ::ActiveRecord::DatabaseAlreadyExists
-          else
-            raise
-          end
-        end
-
-        private
-
-        # Override to use su_username and su_password
-        def establish_master_connection
-          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_hash.merge(
-            password:           su_password,
-            schema_search_path: "public",
-            username:           su_username
-          ))
-        end
-
-        def username
-          @username ||= configuration_hash[:username]
-        end
-
-        def quoted_username
-          @quoted_username ||= ::ActiveRecord::Base.connection.quote_column_name(username)
-        end
-
-        def password
-          @password ||= configuration_hash[:password]
-        end
-
-        def su_username
-          @su_username ||= configuration_hash.fetch(:su_username, username)
-        end
-
-        def su_password
-          @su_password ||= configuration_hash.fetch(:su_password, password)
-        end
-
-        def has_su?
-          return @has_su if defined?(@has_su)
-
-          @has_su = configuration_hash.include?(:su_username)
-        end
-
-        def search_path
-          @search_path ||= configuration_hash[:schema_search_path].to_s.strip.split(",").map(&:strip)
-        end
-
-        def extension_names
-          @extension_names ||= begin
-            extensions = configuration_hash[:postgis_extension]
-            case extensions
-            when ::String
-              extensions.split(",")
-            when ::Array
-              extensions
-            else
-              ["postgis"]
-            end
-          end
-        end
-
-        def ensure_installation_configs
-          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_hash = configuration_hash.merge(postgis_extension: "postgis").freeze
-            end
-          end
-        end
-
-        def setup_gis_from_extension
-          extension_names.each do |extname|
-            if extname == "postgis_topology"
-              unless search_path.include?("topology")
-                raise ArgumentError, "'topology' must be in schema_search_path for postgis_topology"
-              end
-              connection.execute("CREATE EXTENSION IF NOT EXISTS #{extname} SCHEMA topology")
-            else
-              if (postgis_schema = configuration_hash[:postgis_schema])
-                schema_clause = "WITH SCHEMA #{postgis_schema}"
-                unless schema_exists?(postgis_schema)
-                  connection.execute("CREATE SCHEMA #{postgis_schema}")
-                  connection.execute("GRANT ALL ON SCHEMA #{postgis_schema} TO PUBLIC")
-                end
-              else
-                schema_clause = ""
-              end
-
-              connection.execute("CREATE EXTENSION IF NOT EXISTS #{extname} #{schema_clause}")
-            end
-          end
-        end
-
-        def schema_exists?(schema_name)
-          connection.execute(
-            "SELECT schema_name FROM information_schema.schemata WHERE schema_name = '#{schema_name}'"
-          ).any?
-        end
-      end
-
-      ::ActiveRecord::Tasks::DatabaseTasks.register_task(/postgis/, PostGISDatabaseTasks)
-    end
-  end
-end

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

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveRecord  # :nodoc:
-  module ConnectionAdapters  # :nodoc:
-    module PostGIS  # :nodoc:
-      class Railtie < ::Rails::Railtie  # :nodoc:
-        rake_tasks do
-          load "active_record/connection_adapters/postgis/databases.rake"
-        end
-      end
-    end
-  end
-end

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

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveRecord  # :nodoc:
-  module ConnectionAdapters  # :nodoc:
-    module PostGIS  # :nodoc:
-      def self.initial_setup
-        ::ActiveRecord::SchemaDumper.ignore_tables |= %w(
-          geography_columns
-          geometry_columns
-          layer
-          raster_columns
-          raster_overviews
-          spatial_ref_sys
-          topology
-        )
-      end
-    end
-  end
-end