activerecord-postgis-adapter 5.2.3 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb264403ce667c38533139a7997fee61441a34e2f47fe5a1f399839f4c36d87f
-  data.tar.gz: '035912d325f0e37f4c0f92002b7fbd0dd2efc6946c6a241d4b3853ab6feef61e'
+  metadata.gz: a833d2d7fa9bba57717556d4f0caf2999acd233bfc5bbee07a83a3fa611d5027
+  data.tar.gz: 1f5c2155f745932c8f33cf6fed32063078963f026acadd117af60b4ea6a03ec2
 SHA512:
-  metadata.gz: 5cfbae2ee2e7fe317ca2f2844a206a8efcd5f68fba3c0261b9914ffb5133e870fecdaf0dc63ffb132e80c93ce221ce5f5b2008a0e8281b4deca57fa75117823d
-  data.tar.gz: 408b4b9912d8b3577b8cbf7c24f6adca5e15606e8c4a61b048e4734db6984eda03a5075173a7aee2c6666806c9e7a93b6faa3fc0ea391a63090976c84641746b
+  metadata.gz: '0996d86cd8ca024fa121f2396be5fb13bd0da6e04a6fc2ea41cbc3ea5afdb49b03308b7bb90331ff347924b0bc81d624655bc31e6d83d218ef941c06f2ff5285'
+  data.tar.gz: 281e1d2f486993b31636d163d449c901e4dd4d67eb872fd33a0f403ea05001b554980bd621e3fcdd74a0b56b126e3f9e063de5499b93981b07fadb41d08158d6

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#L523
         #
         # 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
@@ -84,7 +75,7 @@ module ActiveRecord
 
         # override
         def create_table_definition(*args)
-          PostGIS::TableDefinition.new(*args)
+          PostGIS::TableDefinition.new(self, *args)
         end
 
         # memoize hash of column infos for tables

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgis-adapter
 version: !ruby/object:Gem::Version
-  version: 5.2.3
+  version: 6.0.0
 platform: ruby
 authors:
 - Daniel Azuma, Tee Parham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-28 00:00:00.000000000 Z
+date: 2019-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rgeo-activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -130,14 +130,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: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: ActiveRecord adapter for PostGIS, based on RGeo.