activerecord-postgis-adapter 7.0.1 → 7.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ca517c070d542c846f7bbba2e01c0767d51bc796f63cc97dea7a6c0c93af2de
-  data.tar.gz: e1f44ef4078302a420dc27582a1ae5e4ff768591f9879ad9ba91bb288e9016df
+  metadata.gz: fcaaf2a57395c122e6541b1e40bd416f5f31fd1e512c250e5222ec5bb3feb650
+  data.tar.gz: 2772452b3ea880ecab759cb5add73d2ed22a89a78e12eae087aff60a061a8f20
 SHA512:
-  metadata.gz: 1333881d9758c1b0d1bf4de5ffb24ddd6a3c10d38edab2063ab20ef994ba9f80bd05a5e949ecc254ce210eaef8ff46a5b2ebf310e7282eb88bbe2719867e852e
-  data.tar.gz: 35876e4747fc87bf5e27b36c354e3c47c20cf81b4dd51daee3369ed290115a71dc297c1d5a07cc4f83637995a3ae2c1b73feeb86e107b4450997f9ff7215243c
+  metadata.gz: 743b335ad32f5d872eebd7c512d7557102ed137664e4336a8c26154fe5f3b2bc3ded2b8e0ebe73195e05e8bb9affb538f7dde93e2aa095b142078e464c2fed98
+  data.tar.gz: 8cfc035141871044857863337a94f4c854423afc784f305853cd1a838dde14ec729a941c50a14edc5841829e8c21ce8c4f04c1826611ecb853d8239fb95401f4

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/databases.rake

@@ -9,7 +9,7 @@ namespace :db do
       environments.each do |environment|
         ActiveRecord::Base.configurations
                           .configs_for(env_name: environment)
-                          .reject { |env| env.configuration_hash['database'].blank? }
+                          .reject { |env| env.configuration_hash[:database].blank? }
                           .each do |env|
           ActiveRecord::ConnectionAdapters::PostGIS::PostGISDatabaseTasks.new(env).setup_gis
         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

@@ -96,8 +96,15 @@ module ActiveRecord
             st_point
             st_polygon
           ).each do |geo_type|
-            map.register_type(geo_type) do |oid, _, sql_type|
-              OID::Spatial.new(oid, sql_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 = OID::Spatial.parse_sql_type(sql_type)
+              OID::Spatial.new(geo_type: geo_type, srid: srid, has_z: has_z, has_m: has_m, geographic: geographic)
             end
           end
 

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

@@ -67,7 +67,7 @@ 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
 

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.1"
+      VERSION = "7.1.0"
     end
   end
 end

data/lib/active_record/connection_adapters/postgis_adapter.rb

@@ -18,6 +18,7 @@ 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"
 
@@ -32,7 +33,7 @@ end
 module ActiveRecord
   module ConnectionAdapters
     class PostGISAdapter < PostgreSQLAdapter
-      ADAPTER_NAME = 'PostGIS'.freeze
+      ADAPTER_NAME = 'PostGIS'
 
       SPATIAL_COLUMN_OPTIONS =
         {
@@ -87,6 +88,39 @@ module ActiveRecord
           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
+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.1
+  version: 7.1.0
 platform: ruby
 authors:
 - Daniel Azuma
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-13 00:00:00.000000000 Z
+date: 2021-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -119,6 +119,7 @@ files:
 - 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