activerecord-postgis-adapter 8.0.0 → 8.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88b08c026151d4f1a930e5fc3299bbf1898a20df441f86b57cde0aabcd29b4cb
-  data.tar.gz: 823b5b9511687fa663273242d5cce9d490610b813df495ad81b43c241c3b443e
+  metadata.gz: a73b6c9fb325971ec1f593c4698c12b68d8e9fd96e3af64f720d842f47f6c7d0
+  data.tar.gz: 52e0aa909ca3a69c74bcab5d6f0af4bd43f6610192a834743c632f803e17ce3c
 SHA512:
-  metadata.gz: f851b74ce6e9da1a4aac3bfcf8acbda44e563f049de04eaf832a8b49cf2acc41cf98495a9ff123786d9bd871658d97637453ae6d845e55f0bf4f5074db01eab7
-  data.tar.gz: 7e47c25711cf8ee49c62a8ad89f9d0b0e5525bf4fb1b45ddb185db6477d0e114a4868a50c612e9a51e880499213cb6cb82f051adf993618eb0978cc0d0f45dc7
+  metadata.gz: 8b1f926834a893d07c9e09928ffbce2635906292a8dbad8f949df978f779c06841cd36b89ab0c160f5f2f197fffeb82907e2b24f18fd2dffd34b8184f9591bdf
+  data.tar.gz: 7da434681d9cfa4f120b76768d0bdab74724e3eca2928df1c4897c94ee7e6b1f8b2367c4a2213831b3a8943b3ac4759fc7de2c8583f422640835fcc2563efe68

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

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module ActiveRecord
+  module ConnectionAdapters
+    module PostGIS
+      module OID
+        module DateTime
+          protected
+
+          # Uses PostGIS instead of PostgreSQLAdapter
+          def real_type_unless_aliased(real_type)
+            ActiveRecord::ConnectionAdapters::PostGISAdapter.datetime_type == real_type ? :datetime : real_type
+          end
+        end
+
+        PostgreSQL::OID::DateTime.prepend(DateTime)
+      end
+    end
+  end
+end

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

@@ -5,18 +5,17 @@ module ActiveRecord
     module PostGIS
       module SchemaStatements
         # override
-        # https://github.com/rails/rails/blob/6-0-stable/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb#L624
+        # https://github.com/rails/rails/blob/7-0-stable/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb#L662
         # Create a SpatialColumn instead of a PostgreSQL::Column
         def new_column_from_field(table_name, field)
-          column_name, type, default, notnull, oid, fmod, collation, comment = field
+          column_name, type, default, notnull, oid, fmod, collation, comment, attgenerated = field
           type_metadata = fetch_type_metadata(column_name, type, oid.to_i, fmod.to_i)
           default_value = extract_value_from_default(default)
           default_function = extract_default_function(default_value, default)
 
-          serial =
-            if (match = default_function&.match(/\Anextval\('"?(?<sequence_name>.+_(?<suffix>seq\d*))"?'::regclass\)\z/))
-              sequence_name_from_parts(table_name, column_name, match[:suffix]) == match[:sequence_name]
-            end
+          if match = default_function&.match(/\Anextval\('"?(?<sequence_name>.+_(?<suffix>seq\d*))"?'::regclass\)\z/)
+            serial = sequence_name_from_parts(table_name, column_name, match[:suffix]) == match[:sequence_name]
+          end
 
           # {:dimension=>2, :has_m=>false, :has_z=>false, :name=>"latlon", :srid=>0, :type=>"GEOMETRY"}
           spatial = spatial_column_info(table_name).get(column_name, type_metadata.sql_type)
@@ -30,49 +29,11 @@ module ActiveRecord
             collation: collation,
             comment: comment.presence,
             serial: serial,
+            generated: attgenerated,
             spatial: spatial
           )
         end
 
-        # override
-        # https://github.com/rails/rails/blob/master/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb#L544
-        #
-        # returns Postgresql sql type string
-        # examples:
-        #   "geometry(Point,4326)"
-        #   "geography(Point,4326)"
-        #
-        # note: type alone is not enough to detect the sql type,
-        # so `limit` is used to pass the additional information. :(
-        #
-        # type_to_sql(:geography, limit: "Point,4326")
-        # => "geography(Point,4326)"
-        def type_to_sql(type, limit: nil, precision: nil, scale: nil, array: nil, **)
-          case type.to_s
-          when "geometry", "geography"
-            "#{type}(#{limit})"
-          else
-            super
-          end
-        end
-
-        # override
-        def native_database_types
-          # Add spatial types
-          super.merge(
-            geography:           { name: "geography" },
-            geometry:            { name: "geometry" },
-            geometry_collection: { name: "geometry_collection" },
-            line_string:         { name: "line_string" },
-            multi_line_string:   { name: "multi_line_string" },
-            multi_point:         { name: "multi_point" },
-            multi_polygon:       { name: "multi_polygon" },
-            spatial:             { name: "geometry" },
-            st_point:            { name: "st_point" },
-            st_polygon:          { name: "st_polygon" }
-          )
-        end
-
         # override
         def create_table_definition(*args, **kwargs)
           PostGIS::TableDefinition.new(self, *args, **kwargs)

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

@@ -9,7 +9,7 @@ module ActiveRecord  # :nodoc:
         #   "Geography(Point,4326)"
         def initialize(name, default, sql_type_metadata = nil, null = true,
                        default_function = nil, collation: nil, comment: nil,
-                       serial: nil, spatial: nil)
+                       serial: nil, generated: nil, spatial: nil)
           @sql_type_metadata = sql_type_metadata
           @geographic = !!(sql_type_metadata.sql_type =~ /geography\(/i)
           if spatial
@@ -31,7 +31,7 @@ module ActiveRecord  # :nodoc:
             build_from_sql_type(sql_type_metadata.sql_type)
           end
           super(name, default, sql_type_metadata, null, default_function,
-                collation: collation, comment: comment, serial: serial)
+                collation: collation, comment: comment, serial: serial, generated: generated)
           if spatial? && @srid
             @limit = { srid: @srid, type: to_type_name(geometric_type) }
             @limit[:has_z] = true if @has_z

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

@@ -8,7 +8,13 @@ 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))
+          col_type = if type.to_sym == :virtual
+            options[:type]
+          else
+            type
+          end
+
+          if (info = PostGISAdapter.spatial_column_options(col_type))
             if (limit = options.delete(:limit)) && limit.is_a?(::Hash)
               options.merge!(limit)
             end

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

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

data/lib/active_record/connection_adapters/postgis_adapter.rb

@@ -18,6 +18,7 @@ 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/oid/spatial"
+require "active_record/connection_adapters/postgis/oid/date_time"
 require "active_record/connection_adapters/postgis/type" # has to be after oid/*
 require "active_record/connection_adapters/postgis/create_connection"
 # :startdoc:
@@ -90,6 +91,24 @@ module ActiveRecord
 
           super
         end
+
+        def native_database_types
+          @native_database_types ||= begin
+            default_types = PostgreSQLAdapter.native_database_types
+            default_types.merge({
+              geography:           { name: "geography" },
+              geometry:            { name: "geometry" },
+              geometry_collection: { name: "geometry_collection" },
+              line_string:         { name: "line_string" },
+              multi_line_string:   { name: "multi_line_string" },
+              multi_point:         { name: "multi_point" },
+              multi_polygon:       { name: "multi_polygon" },
+              spatial:             { name: "geometry" },
+              st_point:            { name: "st_point" },
+              st_polygon:          { name: "st_polygon" }
+            })
+          end
+        end
       end
 
       def srs_database_columns

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgis-adapter
 version: !ruby/object:Gem::Version
-  version: 8.0.0
+  version: 8.0.2
 platform: ruby
 authors:
 - Daniel Azuma
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-03 00:00:00.000000000 Z
+date: 2023-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -81,6 +81,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: benchmark-ips
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.9.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.9.1
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.50'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.50'
 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.
@@ -97,6 +125,7 @@ files:
 - 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/schema_statements.rb
 - lib/active_record/connection_adapters/postgis/spatial_column.rb
@@ -126,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.33
 signing_key: 
 specification_version: 4
 summary: ActiveRecord adapter for PostGIS, based on RGeo.