activerecord-mysql2rgeo-adapter 6.0.2 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58d333c713e0bd75f678bd8fb11812edeeccab83beded3b36bc14a25cd0c4f20
-  data.tar.gz: 49365cad5609ac644e6d2e9ae1727576c2aa321caf350ca95a2e05bd3689cbdb
+  metadata.gz: b51d6b8bbeef0f4003a744ff290caf196e9b244764e1dc0c213e686625f40c59
+  data.tar.gz: 0e8e02728246d292e72bb5dd248ffa47a06a601acbde684551a9c098a1a96286
 SHA512:
-  metadata.gz: fd02b75e6df3f66ecb3ad82ea531c8ea3d25e5a4d0747a0d8154dc157060330ff9e62ce9da2ef36ee195ce45a9c30d39c6026e07eac7cd0bfb8ec0bba8be297f
-  data.tar.gz: 4a5ac24de947e2877bbd1c7bbd105cd80aef155a4759867b31639150294a81236fcfd119d1bc8d8752e27fe2ffff3f34459a745afc9e27a36897a4acb6eacfe6
+  metadata.gz: 4ffae8e8ff77dccdeff97ac7eaaa8167dd42bbc8fe3e51b0240973e729b453d5d99a4b56164bfc2538059e7ad9a0b5089dc8c14472c8469f8e21c3246986ce9b
+  data.tar.gz: 6eb7aacd144536fe15a7068f5731e1d0f00d44b7d6044f94ae83254df5b1a684c579d0ab455d2ad2a2fde715b4594e1893229e25c90beac3389b4de137fb8725

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

@@ -26,42 +26,6 @@ module ActiveRecord
           super
         end
 
-        # override
-        def native_database_types
-          # Add spatial types
-          # Reference: https://dev.mysql.com/doc/refman/5.6/en/spatial-type-overview.html
-          super.merge(
-            geometry:            { name: "geometry" },
-            geometrycollection:  { name: "geometrycollection" },
-            linestring:          { name: "linestring" },
-            multi_line_string:   { name: "multilinestring" },
-            multi_point:         { name: "multipoint" },
-            multi_polygon:       { name: "multipolygon" },
-            spatial:             { name: "geometry" },
-            point:               { name: "point" },
-            polygon:             { name: "polygon" }
-          )
-        end
-
-        def initialize_type_map(m = type_map)
-          super
-
-          %w[
-            geometry
-            geometrycollection
-            point
-            linestring
-            polygon
-            multipoint
-            multilinestring
-            multipolygon
-          ].each do |geo_type|
-            m.register_type(geo_type) do |sql_type|
-              Type::Spatial.new(sql_type)
-            end
-          end
-        end
-
         private
 
         # override

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.2"
+      VERSION = "7.0.0"
     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
@@ -68,6 +80,50 @@ module ActiveRecord
         DEFAULT_SRID
       end
 
+      def native_database_types
+        # Add spatial types
+        # Reference: https://dev.mysql.com/doc/refman/5.6/en/spatial-type-overview.html
+        super.merge(
+          geometry:            { name: "geometry" },
+          geometrycollection:  { name: "geometrycollection" },
+          linestring:          { name: "linestring" },
+          multi_line_string:   { name: "multilinestring" },
+          multi_point:         { name: "multipoint" },
+          multi_polygon:       { name: "multipolygon" },
+          spatial:             { name: "geometry" },
+          point:               { name: "point" },
+          polygon:             { name: "polygon" }
+        )
+      end
+
+      class << self
+
+        private
+          def initialize_type_map(m)
+            super
+
+            %w[
+              geometry
+              geometrycollection
+              point
+              linestring
+              polygon
+              multipoint
+              multilinestring
+              multipolygon
+            ].each do |geo_type|
+              m.register_type(geo_type) do |sql_type|
+                Type::Spatial.new(sql_type.to_s)
+              end
+            end
+          end
+      end
+
+      TYPE_MAP = Type::TypeMap.new.tap { |m| initialize_type_map(m) }
+      TYPE_MAP_WITH_BOOLEAN = Type::TypeMap.new(TYPE_MAP).tap do |m|
+        m.register_type %r(^tinyint\(1\))i, Type::Boolean.new
+      end
+
       def supports_spatial?
         !mariadb? && version >= "5.7.6"
       end
@@ -80,6 +136,11 @@ module ActiveRecord
           super
         end
       end
+
+      private
+        def type_map
+          emulate_booleans ? TYPE_MAP_WITH_BOOLEAN : TYPE_MAP
+        end
     end
   end
 end

data/lib/active_record/type/spatial.rb

@@ -40,7 +40,9 @@ module ActiveRecord
       end
 
       def spatial_factory
-        @spatial_factory ||=
+        @spatial_factories ||= {}
+
+        @spatial_factories[@srid] ||=
           RGeo::ActiveRecord::SpatialFactoryStore.instance.factory(
             geo_type: @geo_type,
             sql_type: @sql_type,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-mysql2rgeo-adapter
 version: !ruby/object:Gem::Version
-  version: 6.0.2
+  version: 7.0.0
 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: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.0.0
 - !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
@@ -128,16 +127,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !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