activerecord-mysql2rgeo-adapter 2.0.3 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 347e7b8819994c6d6759e88a5ab6af2b580650bd
-  data.tar.gz: 8e1aba30818aae96723909abb47da9f304cb7896
+  metadata.gz: 916dd6c6a2f329f0476e864abd896923ff9703d5
+  data.tar.gz: d223eee1c5f0985e9a22cccb2a1b3f16fb5b1111
 SHA512:
-  metadata.gz: c91c8e58ceeef1a4d0482969d52df5abd15008b97580804ef7fde65a4dd6377b8d91f2adc289957d5ec5211ecc5c15862440412f6851d8efa7494c8ad8fd49ba
-  data.tar.gz: 9f772f1d2501e46e9cf7a0982ef73fa06809b17aad795e2ecb6e5307a3f538f1f2e56b904216ca2d50fb9f665e26d702716f0b8d3b11033a270d4fb75996f1b1
+  metadata.gz: 9fd772f34bf93e71654c74ce98716817faf2e67f353fa01cf92dd18714b8c9a218e4b4e648d32338c1f1546d60a1c940b8d31e8f6f758074cc7daada4d9fa76b
+  data.tar.gz: c79130a963ea11b357dbb0c50f21c660299c0fed59c739e3bf35bb36b7a287fded05a0de3ab3122b5fd826b7ef237b73b8c532ae084f16be659bd359dd32f76b

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

@@ -44,8 +44,8 @@ module ActiveRecord
         alias multi_linestring multilinestring
         alias multi_polygon multipolygon
       end
-
-      MySQL::Table.send(:include, ColumnMethods)
     end
+
+    MySQL::Table.include Mysql2Rgeo::ColumnMethods
   end
 end

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

@@ -11,8 +11,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, table_name, default_function, collation, comment: comment)
           if spatial?
             if @srid
               @limit = { type: @geometric_type.type_name.underscore }

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

@@ -12,9 +12,6 @@ module ActiveRecord  # :nodoc:
             end
 
             geo_type = ColumnDefinitionUtils.geo_type(options[:type] || type || info[:type])
-            base_type = info[:type] || :geometry
-
-            # puts name.dup << " - " << type.to_s << " - " << options.to_s << " :: " << geo_type.to_s << " - " << base_type.to_s
 
             options[:spatial_type] = geo_type
             column = super(name, geo_type.downcase.to_sym, options)
@@ -26,8 +23,6 @@ module ActiveRecord  # :nodoc:
         end
       end
 
-      SpatialIndexDefinition = Struct.new(*IndexDefinition.members, :spatial)
-
       module ColumnDefinitionUtils
         class << self
           def geo_type(type = "GEOMETRY")

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

@@ -1,7 +1,7 @@
 module ActiveRecord
   module ConnectionAdapters
     module Mysql2Rgeo
-      VERSION = "2.0.3".freeze
+      VERSION = "2.2.0".freeze
     end
   end
 end

data/lib/active_record/connection_adapters/mysql2rgeo_adapter.rb

@@ -88,13 +88,7 @@ module ActiveRecord
               mysql_index_type = row[:Index_type].downcase.to_sym
               index_type = INDEX_TYPES.include?(mysql_index_type) ? mysql_index_type : nil
               index_using = INDEX_USINGS.include?(mysql_index_type) ? mysql_index_type : nil
-              options = [row[:Table], row[:Key_name], row[:Non_unique].to_i == 0, [], {}, nil, nil, index_type, index_using, row[:Index_comment].presence]
-              indexes << if mysql_index_type == :spatial
-                           options.push(true)
-                           Mysql2Rgeo::SpatialIndexDefinition.new(*options)
-                         else
-                           IndexDefinition.new(row[:Table], row[:Key_name], row[:Non_unique].to_i == 0, [], {}, nil, nil, index_type, index_using, row[:Index_comment].presence)
-                         end
+              indexes << IndexDefinition.new(row[:Table], row[:Key_name], row[:Non_unique].to_i == 0, [], {}, nil, nil, index_type, index_using, row[:Index_comment].presence)
             end
 
             indexes.last.columns << row[:Column_name]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-mysql2rgeo-adapter
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.2.0
 platform: ruby
 authors:
 - Yongdae Hwang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-12 00:00:00.000000000 Z
+date: 2018-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -30,14 +30,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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: ActiveRecord adapter for MySQL, based on RGeo.