activerecord-mysql2rgeo-adapter 5.2.5 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8be8c0bd91551b3593b6be777f8a05243fc136f79e01234678550a09233bb607
-  data.tar.gz: ce6f2c3b063af63d66a8779f007c8367639c8d3f8dea4225680477f0a48ff5eb
+  metadata.gz: 1fc9379b3654f50841c33fd375bc7e14093c39735b1d170afa741e03d40b3d65
+  data.tar.gz: b3b08bf2cd5cbb2b98e5c0f2b78e90ad97b7a3dbc1b9d97240ddb9c6ba5aa131
 SHA512:
-  metadata.gz: 0aa088c4492c15cdab24145b41c3ba37dea76e2b298a03332445698f0b278f2be7c5ed506249d8b4bfe5f214c2d1bd8566eec9e9dabcbcf6a093d3928125e198
-  data.tar.gz: 4cdb993e6a3893cfaa57ad38d21618cbce0ea303d05914586ccf488e2907bab1c2a4aaa2be2bbee0eb9819850173c1d437592fca8c73c92f806f26e387062c83
+  metadata.gz: 4aa49ce58aa62687ae6b95143c7ba13837cceea0bd4e47e726aed65f02c07f9826d870740b270cbc4c9b9d8d2bdafb2e050a25735987a382f78fc3ecf9b82846
+  data.tar.gz: 03a2adb178bb717189c4dff0b3efdfc447802728d66ea14151811b8316972118a8debefcb18c3183144f2b4a0f3c2c6301a5eb26d531c78b983272933db79c77

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

@@ -5,7 +5,7 @@ module ActiveRecord
     module Mysql2Rgeo
       module ColumnMethods
         def spatial(name, options = {})
-          raise "You must set a type. For example: 't.spatial type: :point'" unless options[:type]
+          raise "You must set a type. For example: 't.spatial type: :st_point'" unless options[:type]
 
           column(name, options[:type], options)
         end

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

@@ -4,6 +4,8 @@ module ActiveRecord
   module ConnectionAdapters
     module Mysql2Rgeo
       module SchemaStatements
+        # super: https://github.com/rails/rails/blob/master/activerecord/lib/active_record/connection_adapters/mysql/schema_statements.rb
+
         # override
         def indexes(table_name) #:nodoc:
           indexes = super
@@ -55,10 +57,9 @@ module ActiveRecord
         end
 
         private
-
         # override
-        def create_table_definition(*args)
-          Mysql2Rgeo::TableDefinition.new(*args)
+        def create_table_definition(*args, **options)
+          Mysql2Rgeo::TableDefinition.new(self, *args, **options)
         end
 
         # override
@@ -75,9 +76,8 @@ module ActiveRecord
               default,
               type_metadata,
               field[:Null] == "YES",
-              table_name,
               default_function,
-              field[:Collation],
+              collation: field[:Collation],
               comment: field[:Comment].presence
           )
         end

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

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
+
 module ActiveRecord # :nodoc:
   module ConnectionAdapters # :nodoc:
     module Mysql2Rgeo # :nodoc:
       class SpatialColumn < ConnectionAdapters::MySQL::Column # :nodoc:
-        def initialize(name, default, sql_type_metadata = nil, null = true, table_name = nil, default_function = nil, collation = nil, comment: nil)
+
+        def initialize(name, default, sql_type_metadata = nil, null = true, default_function = nil, collation: nil, comment: nil, **)
           @geometric_type = nil
           if sql_type =~ /geometry|point|linestring|polygon/i
             build_from_sql_type(sql_type_metadata.sql_type)
@@ -11,7 +14,7 @@ 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)
           if spatial?
             if @srid
               @limit = { type: @geometric_type.type_name.underscore }

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RGeo
   module ActiveRecord
     module Mysql2Rgeo

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

@@ -1,11 +1,12 @@
+# frozen_string_literal: true
+
 module ActiveRecord  # :nodoc:
   module ConnectionAdapters  # :nodoc:
     module Mysql2Rgeo  # :nodoc:
       class TableDefinition < MySQL::TableDefinition  # :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 = Mysql2RgeoAdapter.spatial_column_options(type.to_sym))
             if (limit = options.delete(:limit))
               options.merge!(limit) if limit.is_a?(::Hash)

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

@@ -3,7 +3,7 @@
 module ActiveRecord
   module ConnectionAdapters
     module Mysql2Rgeo
-      VERSION = "5.2.5"
+      VERSION = "6.0.0"
     end
   end
 end

data/lib/active_record/connection_adapters/mysql2rgeo_adapter.rb

@@ -24,7 +24,6 @@ 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"
-require "active_record/tasks/database_tasks"
 
 # :startdoc:
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-mysql2rgeo-adapter
 version: !ruby/object:Gem::Version
-  version: 5.2.5
+  version: 6.0.0
 platform: ruby
 authors:
 - Yongdae Hwang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-12 00:00:00.000000000 Z
+date: 2019-09-16 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
@@ -126,7 +126,7 @@ 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:
   - - ">="