activerecord-mysql2rgeo-adapter 6.0.3 → 6.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 609c9daa90d73fa24300948060c080d5e75f38e63163fdff0ed15e8ed8185126
-  data.tar.gz: 141ea30c5e86b4c5dd6e86b6779343d063d377a2d51fb5f87bc68446f3bf34a3
+  metadata.gz: fc08589944b261d0dca6908f375c8453eae76a29ff3da7a6c76f264fac0400dd
+  data.tar.gz: a3682118ef63d2605688f0f2c81713af2c58987a42f40425baff6f58326bf059
 SHA512:
-  metadata.gz: 921929a8523f225a01db835ed7721d3bbc90f25ccce9eb99a74db9d708f07d81f65b331770b0d0e982d2b019906af4355086aa881cceb5424ec26b125d77ec88
-  data.tar.gz: 46551aa0b6cb5cdf5debcc2a3e06de0e9a31c24c77bb3e2aca7a76dc54fcb9ea5710a2f90b66c7baac2911e50880a38dc9ff072de2470c7265110fbf81dcf01d
+  metadata.gz: 6a791e518607f77b3fa3affcca3402498d669d8011613c33e811db57278096382b87897a1477b8b18a66c4175ecd419ed161dd57a050b837b6e160943108158a
+  data.tar.gz: 03d6461ef1db07a0deedba7d5843bf6e9a4a00927de6f5e3b6c1ecf8834e1c95494d6ff03b56d0b08aeab675a4e39cea1e7623808507e5b4c62270f3e540a82f

data/lib/active_record/connection_adapters/mysql2rgeo/schema_creation.rb

@@ -4,15 +4,13 @@ module ActiveRecord
   module ConnectionAdapters
     module Mysql2Rgeo
       class SchemaCreation < MySQL::SchemaCreation # :nodoc:
-        delegate :supports_expression_index?, to: :@conn, private: true
-
         private
 
           def add_column_options!(sql, options)
             # By default, TIMESTAMP columns are NOT NULL, cannot contain NULL values,
             # and assigning NULL assigns the current timestamp. To permit a TIMESTAMP
             # column to contain NULL, explicitly declare it with the NULL attribute.
-            # See https://dev.mysql.com/doc/refman/5.7/en/timestamp-initialization.html
+            # See https://dev.mysql.com/doc/refman/en/timestamp-initialization.html
             if /\Atimestamp\b/.match?(options[:column].sql_type) && !options[:primary_key]
               sql << " NULL" unless options[:null] == false || options_include_default?(options)
             end

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

@@ -20,7 +20,7 @@ module ActiveRecord # :nodoc:
           super(name, default, sql_type_metadata, null, default_function, collation: collation, comment: comment)
           if spatial?
             if @srid
-              @limit = { type: @geometric_type.type_name.underscore, srid: @srid }
+              @limit = { type: geometric_type.type_name.underscore, srid: @srid }
             end
           end
         end
@@ -43,24 +43,16 @@ module ActiveRecord # :nodoc:
         alias has_z? has_z
         alias has_m? has_m
 
-        def limit
-          if spatial?
-            @limit
-          else
-            super
-          end
+        def multi?
+          /^(geometrycollection|multi)/i.match?(sql_type)
         end
 
-        def klass
-          type == :spatial ? RGeo::Feature::Geometry : super
+        def limit
+          spatial? ? @limit : super
         end
 
         def spatial?
-          !@geometric_type.nil?
-        end
-
-        def multi?
-          /^(geometrycollection|multi)/i.match?(sql_type)
+          %i[geometry geography].include?(@sql_type_metadata.type)
         end
 
         private

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

@@ -3,7 +3,7 @@
 module ActiveRecord
   module ConnectionAdapters
     module Mysql2Rgeo
-      VERSION = "6.0.3"
+      VERSION = "6.1.1"
     end
   end
 end

data/lib/active_record/connection_adapters/mysql2rgeo_adapter.rb

@@ -7,13 +7,7 @@
 
 require "rgeo/active_record"
 
-# autoload AbstractAdapter to avoid circular require and void context warnings
-module ActiveRecord
-  module ConnectionAdapters
-    AbstractAdapter
-  end
-end
-
+require "active_record/connection_adapters"
 require "active_record/connection_adapters/mysql2_adapter"
 require "active_record/connection_adapters/mysql2rgeo/version"
 require "active_record/connection_adapters/mysql2rgeo/column_methods"
@@ -25,13 +19,35 @@ require "active_record/connection_adapters/mysql2rgeo/spatial_column_info"
 require "active_record/connection_adapters/mysql2rgeo/spatial_expressions"
 require "active_record/connection_adapters/mysql2rgeo/arel_tosql"
 require "active_record/type/spatial"
-require "active_record/connection_adapters/mysql2rgeo/create_connection"
 
 # :startdoc:
 
 module ActiveRecord
+  module ConnectionHandling # :nodoc:
+    # Establishes a connection to the database that's used by all Active Record objects.
+    def mysql2rgeo_connection(config)
+      config = config.symbolize_keys
+      config[:flags] ||= 0
+
+      if config[:flags].kind_of? Array
+        config[:flags].push "FOUND_ROWS"
+      else
+        config[:flags] |= Mysql2::Client::FOUND_ROWS
+      end
+
+      ConnectionAdapters::Mysql2RgeoAdapter.new(
+        ConnectionAdapters::Mysql2RgeoAdapter.new_client(config),
+        logger,
+        nil,
+        config,
+      )
+    end
+  end
+
   module ConnectionAdapters
     class Mysql2RgeoAdapter < Mysql2Adapter
+      ADAPTER_NAME = "Mysql2Rgeo"
+
       include Mysql2Rgeo::SchemaStatements
 
       SPATIAL_COLUMN_OPTIONS =
@@ -56,10 +72,6 @@ module ActiveRecord
         @visitor = Arel::Visitors::Mysql2Rgeo.new(self)
       end
 
-      def adapter_name
-        "Mysql2Rgeo"
-      end
-
       def self.spatial_column_options(key)
         SPATIAL_COLUMN_OPTIONS[key]
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-mysql2rgeo-adapter
 version: !ruby/object:Gem::Version
-  version: 6.0.3
+  version: 6.1.1
 platform: ruby
 authors:
 - Yongdae Hwang
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-14 00:00:00.000000000 Z
+date: 2022-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: rgeo-activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     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
@@ -105,7 +105,6 @@ files:
 - LICENSE.txt
 - lib/active_record/connection_adapters/mysql2rgeo/arel_tosql.rb
 - lib/active_record/connection_adapters/mysql2rgeo/column_methods.rb
-- lib/active_record/connection_adapters/mysql2rgeo/create_connection.rb
 - lib/active_record/connection_adapters/mysql2rgeo/schema_creation.rb
 - lib/active_record/connection_adapters/mysql2rgeo/schema_statements.rb
 - lib/active_record/connection_adapters/mysql2rgeo/spatial_column.rb
@@ -120,7 +119,7 @@ homepage: http://github.com/stadia/activerecord-mysql2rgeo-adapter
 licenses:
 - BSD-3-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -135,9 +134,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
 summary: ActiveRecord adapter for MySQL, based on RGeo.
 test_files: []

data/lib/active_record/connection_adapters/mysql2rgeo/create_connection.rb

@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-
-if RUBY_ENGINE == "jruby"
-  require "active_record/connection_adapters/jdbcmysql_adapter"
-else
-  require "mysql2"
-end
-
-module ActiveRecord # :nodoc:
-  module ConnectionHandling # :nodoc:
-    if RUBY_ENGINE == "jruby"
-
-      def jdbcmysql2rgeo_connection(config)
-        config[:adapter_class] = ConnectionAdapters::Mysql2RgeoAdapter
-        mysql2_connection(config)
-      end
-
-      alias jdbcmysql2rgeo_connection mysql2rgeo_connection
-
-    else
-
-      # Based on the default <tt>mysql2_connection</tt> definition from ActiveRecord.
-      # https://github.com/rails/rails/blob/master/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
-      # FULL REPLACEMENT because we need to create a different class.
-
-      def mysql2rgeo_connection(config)
-        config = config.symbolize_keys
-
-        config[:username] = "root" if config[:username].nil?
-        config[:flags] ||= 0
-
-        if Mysql2::Client.const_defined? :FOUND_ROWS
-          if config[:flags].is_a? Array
-            config[:flags].push "FOUND_ROWS"
-          else
-            config[:flags] |= Mysql2::Client::FOUND_ROWS
-          end
-        end
-
-        client = Mysql2::Client.new(config)
-        ConnectionAdapters::Mysql2RgeoAdapter.new(client, logger, nil, config)
-      rescue Mysql2::Error => e
-        if e.message.include?("Unknown database")
-          raise ActiveRecord::NoDatabaseError
-        else
-          raise
-        end
-      end
-    end
-  end
-end