activerecord-postgis-adapter 6.0.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a833d2d7fa9bba57717556d4f0caf2999acd233bfc5bbee07a83a3fa611d5027
-  data.tar.gz: 1f5c2155f745932c8f33cf6fed32063078963f026acadd117af60b4ea6a03ec2
+  metadata.gz: 978d238ad317f3e43d498f237d63573aa71291fe2485f2b35b0013e829bc0727
+  data.tar.gz: 2520a77cc0070c3afaa4fdba2d771ba05e9fb569186e35a4e92dd24816f43ae3
 SHA512:
-  metadata.gz: '0996d86cd8ca024fa121f2396be5fb13bd0da6e04a6fc2ea41cbc3ea5afdb49b03308b7bb90331ff347924b0bc81d624655bc31e6d83d218ef941c06f2ff5285'
-  data.tar.gz: 281e1d2f486993b31636d163d449c901e4dd4d67eb872fd33a0f403ea05001b554980bd621e3fcdd74a0b56b126e3f9e063de5499b93981b07fadb41d08158d6
+  metadata.gz: 5a9e6472022e69fbaf2d07dd76f98cdf97c440f6009a26ccd59d1b580ca4ff3590b889e0c1afe9addb2f518e88decec6e1107a5b0301c12ce19b9df5e22073ff
+  data.tar.gz: 102a2b33b86298a52ae3dac860bf75d0531ad32974b914f2e5ebc154d6d22c21c371770d6c649fa6abb7654984c5e3e3d4bdb6cab106ffb0304cd83f15f8e529

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

@@ -6,43 +6,43 @@ module ActiveRecord
       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)
+          column(name, options[:type], **options)
         end
 
         def geography(name, options = {})
-          column(name, :geography, options)
+          column(name, :geography, **options)
         end
 
         def geometry(name, options = {})
-          column(name, :geometry, options)
+          column(name, :geometry, **options)
         end
 
         def geometry_collection(name, options = {})
-          column(name, :geometry_collection, options)
+          column(name, :geometry_collection, **options)
         end
 
         def line_string(name, options = {})
-          column(name, :line_string, options)
+          column(name, :line_string, **options)
         end
 
         def multi_line_string(name, options = {})
-          column(name, :multi_line_string, options)
+          column(name, :multi_line_string, **options)
         end
 
         def multi_point(name, options = {})
-          column(name, :multi_point, options)
+          column(name, :multi_point, **options)
         end
 
         def multi_polygon(name, options = {})
-          column(name, :multi_polygon, options)
+          column(name, :multi_polygon, **options)
         end
 
         def st_point(name, options = {})
-          column(name, :st_point, options)
+          column(name, :st_point, **options)
         end
 
         def st_polygon(name, options = {})
-          column(name, :st_polygon, options)
+          column(name, :st_polygon, **options)
         end
       end
     end

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

@@ -35,7 +35,7 @@ module ActiveRecord
         end
 
         # override
-        # https://github.com/rails/rails/blob/master/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb#L523
+        # https://github.com/rails/rails/blob/master/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb#L544
         #
         # returns Postgresql sql type string
         # examples:
@@ -74,8 +74,8 @@ module ActiveRecord
         end
 
         # override
-        def create_table_definition(*args)
-          PostGIS::TableDefinition.new(self, *args)
+        def create_table_definition(*args, **kwargs)
+          PostGIS::TableDefinition.new(self, *args, **kwargs)
         end
 
         # memoize hash of column infos for tables
@@ -85,8 +85,6 @@ module ActiveRecord
         end
 
         def initialize_type_map(map = type_map)
-          super
-
           %w(
             geography
             geometry
@@ -102,6 +100,8 @@ module ActiveRecord
               OID::Spatial.new(oid, sql_type)
             end
           end
+
+          super
         end
       end
     end

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

@@ -7,7 +7,7 @@ module ActiveRecord  # :nodoc:
         include ColumnMethods
 
         # 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)
+        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)
@@ -18,9 +18,9 @@ module ActiveRecord  # :nodoc:
 
             options[:limit] = ColumnDefinitionUtils.limit_from_options(geo_type, options)
             options[:spatial_type] = geo_type
-            column = super(name, base_type, options)
+            column = super(name, base_type, **options)
           else
-            column = super(name, type, options)
+            column = super(name, type, **options)
           end
 
           column

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

@@ -3,7 +3,7 @@
 module ActiveRecord
   module ConnectionAdapters
     module PostGIS
-      VERSION = "6.0.0"
+      VERSION = "6.0.1"
     end
   end
 end

data/lib/active_record/connection_adapters/postgis_adapter.rb

@@ -38,7 +38,7 @@ end
 module ActiveRecord
   module ConnectionAdapters
     class PostGISAdapter < PostgreSQLAdapter
-      include PostGIS::SchemaStatements
+      ADAPTER_NAME = 'PostGIS'.freeze
 
       SPATIAL_COLUMN_OPTIONS =
         {
@@ -57,22 +57,10 @@ module ActiveRecord
       # http://postgis.17.x6.nabble.com/Default-SRID-td5001115.html
       DEFAULT_SRID = 0
 
-      # def initialize(*args)
-      def initialize(connection, logger, connection_parameters, config)
-        super
-
-        @visitor = Arel::Visitors::PostGIS.new(self)
-        # copy from https://github.com/rails/rails/blob/6ece7df8d80c6d93db43878fa4c0278a0204072c/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb#L199
-        if self.class.type_cast_config_to_boolean(config.fetch(:prepared_statements) { true })
-          @prepared_statements = true
-          @visitor.extend(DetermineIfPreparableVisitor)
-        else
-          @prepared_statements = false
-        end
-      end
+      include PostGIS::SchemaStatements
 
-      def adapter_name
-        "PostGIS"
+      def arel_visitor # :nodoc:
+        Arel::Visitors::PostGIS.new(self)
       end
 
       def self.spatial_column_options(key)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgis-adapter
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.1
 platform: ruby
 authors:
 - Daniel Azuma, Tee Parham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-21 00:00:00.000000000 Z
+date: 2020-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: ActiveRecord adapter for PostGIS, based on RGeo.