activerecord-postgis-adapter 5.2.2 → 6.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6467b540dc2494cfe0add8a78d7d04258c6ae7a64b32ef397d7b58703b961d8
-  data.tar.gz: 508f828273255798e15451a683d331c7488fb2d0840f92ba5dccb7c7d97f2f9b
+  metadata.gz: 6f48bf8a031b980aa3b0f5126c348628f06c5d20c7a12d50b4994bb6b118f718
+  data.tar.gz: f5bdbb705028bc67f7bd506038e1017de0ada5b96f529db6761977f03f7ec1d2
 SHA512:
-  metadata.gz: 198647715bc7f7ed32b996e1dc5be24019d27c65b3cf3085b1b09d0544052b0f302aff527e58de2e75fd43964365af79044f512ee10575102284f82a489222d0
-  data.tar.gz: dbe312d6930f13c271a0ee82312e05966e645c7d77edb2dd31643e5277b3de755b35f0d55e7e5704ba56ea47a9d10efbb0e57b7b67e9019bb19366fadd2fd579
+  metadata.gz: 91939a84b430809a77548cc34c8c792264306fe55219fa2d7ec2328509db0a3345ecb93a4ae742d94f483444ab6bd579e77f551ffbb86e01bda472b4d248239e
+  data.tar.gz: 3f02dfbbea496a28d5a529f59628466cd1e146a7e2de8c39510ae5f172f6cbceff2978e7e34e2b2a1e644c4ae43d4bad100bd004971b84e278d7fc50537ca1f7

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/create_connection.rb

@@ -31,13 +31,18 @@ module ActiveRecord  # :nodoc:
         conn_params[:user] = conn_params.delete(:username) if conn_params[:username]
         conn_params[:dbname] = conn_params.delete(:database) if conn_params[:database]
 
-        # Forward only valid config params to PGconn.connect.
+        # Forward only valid config params to PG.connect
         valid_conn_param_keys = PG::Connection.conndefaults_hash.keys + [:requiressl]
         conn_params.slice!(*valid_conn_param_keys)
 
-        # The postgres drivers don't allow the creation of an unconnected PGconn object,
-        # so just pass a nil connection object for the time being.
-        ConnectionAdapters::PostGISAdapter.new(nil, logger, conn_params, config)
+        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
       end
 
     end

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

@@ -6,13 +6,14 @@ namespace :db do
     task setup: [:load_config] do
       environments = [Rails.env]
       environments << "test" if Rails.env.development?
-      ActiveRecord::Base.configurations
-        .values_at(*environments)
-        .compact
-        .reject { |config| config["database"].blank? }
-        .each do |config|
-          ActiveRecord::ConnectionAdapters::PostGIS::PostGISDatabaseTasks.new(config).setup_gis
-        end
+      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/schema_statements.rb

@@ -5,46 +5,37 @@ module ActiveRecord
     module PostGIS
       module SchemaStatements
         # override
-        # pass table_name to #new_column
-        def columns(table_name)
-          # Limit, precision, and scale are all handled by the superclass.
-          column_definitions(table_name).map do |column_name, type, default, notnull, oid, fmod, collation, comment|
-            oid = oid.to_i
-            fmod = fmod.to_i
-            type_metadata = fetch_type_metadata(column_name, type, oid, fmod)
-            cast_type = get_oid_type(oid.to_i, fmod.to_i, column_name, type)
-            default_value = extract_value_from_default(default)
+        # https://github.com/rails/rails/blob/6-0-stable/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb#L624
+        # 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
+          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)
 
-            default_function = extract_default_function(default_value, default)
-            new_column(table_name, column_name, default_value, cast_type, type_metadata, !notnull,
-                       default_function, collation, comment)
-          end
-        end
-
-        # override
-        def new_column(table_name, column_name, default, cast_type, sql_type_metadata = nil,
-                       null = true, default_function = nil, collation = nil, comment = nil)
-          # JDBC gets true/false in Rails 4, where other platforms get 't'/'f' strings.
-          if null.is_a?(String)
-            null = (null == "t")
-          end
+          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
 
-          column_info = spatial_column_info(table_name).get(column_name, sql_type_metadata.sql_type)
+          # {: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)
 
-          SpatialColumn.new(column_name,
-                            default,
-                            sql_type_metadata,
-                            null,
-                            table_name,
-                            default_function,
-                            collation,
-                            comment,
-                            cast_type,
-                            column_info)
+          SpatialColumn.new(
+            column_name,
+            default_value,
+            type_metadata,
+            !notnull,
+            default_function,
+            collation: collation,
+            comment: comment.presence,
+            serial: serial,
+            spatial: spatial
+          )
         end
 
         # override
-        # https://github.com/rails/rails/blob/master/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb#L583
+        # https://github.com/rails/rails/blob/master/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb#L544
         #
         # returns Postgresql sql type string
         # examples:
@@ -54,12 +45,12 @@ module ActiveRecord
         # note: type alone is not enough to detect the sql type,
         # so `limit` is used to pass the additional information. :(
         #
-        # type_to_sql(:geography, "Point,4326")
+        # type_to_sql(:geography, limit: "Point,4326")
         # => "geography(Point,4326)"
-        def type_to_sql(type, options = {})
-          case type
-          when :geometry, :geography
-            "#{type}(#{options[:limit]})"
+        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
@@ -83,8 +74,8 @@ module ActiveRecord
         end
 
         # override
-        def create_table_definition(*args)
-          PostGIS::TableDefinition.new(*args)
+        def create_table_definition(*args, **kwargs)
+          PostGIS::TableDefinition.new(self, *args, **kwargs)
         end
 
         # memoize hash of column infos for tables
@@ -94,8 +85,6 @@ module ActiveRecord
         end
 
         def initialize_type_map(map = type_map)
-          super
-
           %w(
             geography
             geometry
@@ -111,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_column.rb

@@ -7,19 +7,17 @@ module ActiveRecord  # :nodoc:
         # sql_type examples:
         #   "Geometry(Point,4326)"
         #   "Geography(Point,4326)"
-        # cast_type example classes:
-        #   OID::Spatial
-        #   OID::Integer
-        def initialize(name, default, sql_type_metadata = nil, null = true, table_name = nil,
-                       default_function = nil, collation = nil, comment = nil, cast_type = nil, opts = nil)
-          @cast_type = cast_type
+        def initialize(name, default, sql_type_metadata = nil, null = true,
+                       default_function = nil, collation: nil, comment: nil,
+                       serial: nil, spatial: nil)
+          @sql_type_metadata = sql_type_metadata
           @geographic = !!(sql_type_metadata.sql_type =~ /geography\(/i)
-          if opts
+          if spatial
             # This case comes from an entry in the geometry_columns table
-            set_geometric_type_from_name(opts[:type])
-            @srid = opts[:srid].to_i
-            @has_z = !!opts[:has_z]
-            @has_m = !!opts[:has_m]
+            set_geometric_type_from_name(spatial[:type])
+            @srid = spatial[:srid].to_i
+            @has_z = !!spatial[:has_z]
+            @has_m = !!spatial[:has_m]
           elsif @geographic
             # Geographic type information is embedded in the SQL type
             @srid = 4326
@@ -32,7 +30,8 @@ module ActiveRecord  # :nodoc:
             # @geometric_type = geo_type_from_sql_type(sql_type)
             build_from_sql_type(sql_type_metadata.sql_type)
           end
-          super(name, default, sql_type_metadata, null, table_name, default_function, collation, comment: comment)
+          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) }
@@ -54,15 +53,11 @@ module ActiveRecord  # :nodoc:
         alias :has_m? :has_m
 
         def limit
-          if spatial?
-            @limit
-          else
-            super
-          end
+          spatial? ? @limit : super
         end
 
         def spatial?
-          @cast_type.respond_to?(:spatial?) && @cast_type.spatial?
+          %i[geometry geography].include?(@sql_type_metadata.type)
         end
 
         private

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 = "5.2.2"
+      VERSION = "6.0.2"
     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'
 
       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)
@@ -108,3 +96,21 @@ module ActiveRecord
     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,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgis-adapter
 version: !ruby/object:Gem::Version
-  version: 5.2.2
+  version: 6.0.2
 platform: ruby
 authors:
-- Daniel Azuma, Tee Parham
+- Daniel Azuma
+- Tee Parham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-02 00:00:00.000000000 Z
+date: 2021-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: rgeo-activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -44,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
@@ -97,7 +98,10 @@ dependencies:
 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.
-email: dazuma@gmail.com, parhameter@gmail.com
+email:
+- dazuma@gmail.com
+- parhameter@gmail.com
+- kfdoggett@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -120,7 +124,7 @@ files:
 - lib/activerecord-postgis-adapter.rb
 homepage: http://github.com/rgeo/activerecord-postgis-adapter
 licenses:
-- BSD
+- BSD-3-Clause
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -130,15 +134,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: ActiveRecord adapter for PostGIS, based on RGeo.