activerecord-mysql2rgeo-adapter 2.2.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 916dd6c6a2f329f0476e864abd896923ff9703d5
-  data.tar.gz: d223eee1c5f0985e9a22cccb2a1b3f16fb5b1111
+SHA256:
+  metadata.gz: 46398dbc631a7df55cb3a6364227d7d7aff3bed23e1a442bed6a72394e5f86a6
+  data.tar.gz: 0dcdf66fd2fcaba12c67c2fc6611c935251f131b183df82c25cd5b246e7b89a8
 SHA512:
-  metadata.gz: 9fd772f34bf93e71654c74ce98716817faf2e67f353fa01cf92dd18714b8c9a218e4b4e648d32338c1f1546d60a1c940b8d31e8f6f758074cc7daada4d9fa76b
-  data.tar.gz: c79130a963ea11b357dbb0c50f21c660299c0fed59c739e3bf35bb36b7a287fded05a0de3ab3122b5fd826b7ef237b73b8c532ae084f16be659bd359dd32f76b
+  metadata.gz: 072f382d883353b35f83a9b3463d554696ee6732131aceebfc34aa837d25b0ed04efa38f65427c8bb51132cfc27e74d0e5cbf5992582ada3f2e15a8543d83f34
+  data.tar.gz: a72920ef741fa5c5220fec549a9ce393aee044e81611a70f062fb76011a264d4c8bc5029e20d0d927293c60fe5c7956a2f0ed6bbfb654fd62da94f5cebda94fe

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Arel  # :nodoc:
   module Visitors  # :nodoc:
     # Different super-class under JRuby JDBC adapter.
@@ -5,7 +7,7 @@ module Arel  # :nodoc:
                         ::ArJdbc::MySQL::BindSubstitution
                       else
                         MySQL
-                        end
+                      end
 
     class Mysql2Rgeo < MySQLSuperclass  # :nodoc:
       include RGeo::ActiveRecord::SpatialToSql

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

@@ -1,48 +1,51 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module ConnectionAdapters
     module Mysql2Rgeo
       module ColumnMethods
         def spatial(name, options = {})
-          raise "You must set a type. For example: 't.spatial :object1, limit: { type: 'point' }'" if options[:limit].blank? || options[:limit][:type].blank?
-          column(name, options[:limit][:type], options)
-        end
+          raise "You must set a type. For example: 't.spatial type: :st_point'" unless options[:type]
 
-        def geometry(*args, multi: false, **options)
-          multi ? multi_geometry(*args, **options) : args.each { |name| column(name, :geometry, options) }
+          column(name, options[:type], **options)
         end
 
-        def geometrycollection(*args, **options)
-          args.each { |name| column(name, :geometrycollection, options) }
+        def geometry(name, options = {})
+          column(name, :geometry, **options)
         end
 
-        def point(*args, multi: false, **options)
-          multi ? multi_point(*args, **options) : args.each { |name| column(name, :point, options) }
+        def geometry_collection(name, options = {})
+          column(name, :geometrycollection, **options)
         end
+        alias geometrycollection geometry_collection
 
-        def multipoint(*args, **options)
-          args.each { |name| column(name, :multipoint, options) }
+        def line_string(name, options = {})
+          column(name, :linestring, **options)
         end
+        alias linestring line_string
 
-        def linestring(*args, multi: false, **options)
-          multi ? multi_linestring(*args, **options) : args.each { |name| column(name, :linestring, options) }
+        def multi_line_string(name, options = {})
+          column(name, :multilinestring, **options)
         end
+        alias multilinestring multi_line_string
 
-        def multilinestring(*args, **options)
-          args.each { |name| column(name, :multilinestring, options) }
+        def multi_point(name, options = {})
+          column(name, :multipoint, **options)
         end
+        alias multipoint multi_point
 
-        def polygon(*args, multi: false, **options)
-          multi ? multipolygon(*args, **options) : args.each { |name| column(name, :polygon, options) }
+        def multi_polygon(name, options = {})
+          column(name, :multipolygon, **options)
         end
+        alias multipolygon multi_polygon
 
-        def multipolygon(*args, **options)
-          args.each { |name| column(name, :multipolygon, options) }
+        def point(name, options = {})
+          column(name, :point, **options)
         end
 
-        alias multi_point multipoint
-        alias multi_geometry geometrycollection
-        alias multi_linestring multilinestring
-        alias multi_polygon multipolygon
+        def polygon(name, options = {})
+          column(name, :polygon, **options)
+        end
       end
     end
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 if RUBY_ENGINE == "jruby"
   require "active_record/connection_adapters/jdbcmysql_adapter"
 else
@@ -13,7 +15,7 @@ module ActiveRecord # :nodoc:
         mysql2_connection(config)
       end
 
-      alias jdbcmysql2rgeo_connection mysql2rgeo_connection
+      alias_method :jdbcmysql2rgeo_connection, :mysql2rgeo_connection
 
     else
 
@@ -29,7 +31,7 @@ module ActiveRecord # :nodoc:
 
         if Mysql2::Client.const_defined? :FOUND_ROWS
           if config[:flags].is_a? Array
-            config[:flags].push "FOUND_ROWS".freeze
+            config[:flags].push "FOUND_ROWS"
           else
             config[:flags] |= Mysql2::Client::FOUND_ROWS
           end

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

@@ -1,16 +1,23 @@
+# frozen_string_literal: true
+
 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 new_column(*args)
-          SpatialColumn.new(*args)
+        def indexes(table_name) #:nodoc:
+          indexes = super
+          # HACK(aleks, 06/15/18): MySQL 5 does not support prefix lengths for spatial indexes
+          # https://dev.mysql.com/doc/refman/5.6/en/create-index.html
+          indexes.select { |idx| idx.type == :spatial }.each { |idx| idx.is_a?(Struct) ? idx.lengths = {} : idx.instance_variable_set(:@lengths, {}) }
+          indexes
         end
 
         def type_to_sql(type, limit: nil, precision: nil, scale: nil, unsigned: nil, **) # :nodoc:
           if (info = RGeo::ActiveRecord.geometric_type_from_name(type.to_s.delete("_")))
             type = limit[:type] || type if limit.is_a?(::Hash)
-            type = :geometry if type.eql? :spatial
             type = type.to_s.delete("_").upcase
           end
           super
@@ -19,32 +26,28 @@ module ActiveRecord
         # 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" },
-            point: { name: "point" },
-            linestring: { name: "linestring" },
-            polygon: { name: "polygon" },
-            multi_geometry: { name: "geometrycollection" },
-            multi_point: { name: "multipoint" },
-            multi_linestring: { name: "multilinestring" },
-            multi_polygon: { name: "multipolygon" },
-            spatial: { name: "geometry", limit: { type: :point } }
+            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
 
-        # override
-        def create_table_definition(*args)
-          Mysql2Rgeo::TableDefinition.new(*args)
-        end
-
-        def initialize_type_map(m)
+        def initialize_type_map(m = type_map)
           super
           %w(
             geometry
+            geometrycollection
             point
             linestring
             polygon
-            geometrycollection
             multipoint
             multilinestring
             multipolygon
@@ -52,6 +55,32 @@ module ActiveRecord
             m.register_type(geo_type, Type::Spatial.new(geo_type))
           end
         end
+
+        private
+        # override
+        def create_table_definition(*args, **options)
+          Mysql2Rgeo::TableDefinition.new(self, *args, **options)
+        end
+
+        # override
+        def new_column_from_field(table_name, field)
+          type_metadata = fetch_type_metadata(field[:Type], field[:Extra])
+          if type_metadata.type == :datetime && /\ACURRENT_TIMESTAMP(?:\([0-6]?\))?\z/i.match?(field[:Default])
+            default, default_function = nil, field[:Default]
+          else
+            default, default_function = field[:Default], nil
+          end
+
+          SpatialColumn.new(
+              field[:Field],
+              default,
+              type_metadata,
+              field[:Null] == "YES",
+              default_function,
+              collation: field[:Collation],
+              comment: field[:Comment].presence
+          )
+        end
       end
     end
   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 }
@@ -34,9 +37,9 @@ module ActiveRecord # :nodoc:
           false
         end
 
+        alias :geographic? :geographic
         alias :has_z? :has_z
         alias :has_m? :has_m
-        alias :geographic? :geographic
 
         def limit
           if spatial?
@@ -65,7 +68,7 @@ module ActiveRecord # :nodoc:
         end
 
         def build_from_sql_type(sql_type)
-          geo_type, @srid, @has_z, @has_m = Type::Spatial.parse_sql_type(sql_type)
+          geo_type, @srid = Type::Spatial.parse_sql_type(sql_type)
           set_geometric_type_from_name(geo_type)
         end
       end

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)
@@ -14,9 +15,9 @@ module ActiveRecord  # :nodoc:
             geo_type = ColumnDefinitionUtils.geo_type(options[:type] || type || info[:type])
 
             options[:spatial_type] = geo_type
-            column = super(name, geo_type.downcase.to_sym, options)
+            column = super(name, geo_type.downcase.to_sym, **options)
           else
-            column = super(name, type, options)
+            column = super(name, type, **options)
           end
 
           column

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

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module ConnectionAdapters
     module Mysql2Rgeo
-      VERSION = "2.2.0".freeze
+      VERSION = "6.0.1"
     end
   end
-end
+end

data/lib/active_record/connection_adapters/mysql2rgeo_adapter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # The activerecord-mysql2rgeo-adapter gem installs the *mysql2rgeo*
 # connection adapter into ActiveRecord.
 
@@ -32,16 +34,16 @@ module ActiveRecord
 
       SPATIAL_COLUMN_OPTIONS =
         {
-          geometry: {},
-          geometrycollection: {},
-          linestring: {},
-          multilinestring: {},
-          multipoint: {},
-          multipolygon: {},
-          spatial: { type: "geometry" },
-          point: {},
-          polygon: {}
-        }.freeze
+          geometry:            {},
+          geometrycollection:  {},
+          linestring:          {},
+          multilinestring:     {},
+          multipoint:          {},
+          multipolygon:        {},
+          spatial:             { type: "geometry" },
+          point:               {},
+          polygon:             {}
+        }
 
       # http://postgis.17.x6.nabble.com/Default-SRID-td5001115.html
       DEFAULT_SRID = 0
@@ -50,11 +52,10 @@ module ActiveRecord
         super
 
         @visitor = Arel::Visitors::Mysql2Rgeo.new(self)
-        @visitor.extend(DetermineIfPreparableVisitor) if self.class.type_cast_config_to_boolean(config.fetch(:prepared_statements) { true })
       end
 
       def adapter_name
-        "Mysql2Rgeo".freeze
+        "Mysql2Rgeo"
       end
 
       def self.spatial_column_options(key)
@@ -69,39 +70,10 @@ module ActiveRecord
         !mariadb? && version >= "5.7.6"
       end
 
-      # Returns an array of indexes for the given table.
-      def indexes(table_name, name = nil) #:nodoc:
-        if name
-          ActiveSupport::Deprecation.warn(<<-MSG.squish)
-            Passing name to #indexes is deprecated without replacement.
-          MSG
-        end
-
-        indexes = []
-        current_index = nil
-        execute_and_free("SHOW KEYS FROM #{quote_table_name(table_name)}", "SCHEMA") do |result|
-          each_hash(result) do |row|
-            if current_index != row[:Key_name]
-              next if row[:Key_name] == "PRIMARY" # skip the primary key
-              current_index = row[:Key_name]
-
-              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
-              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]
-            indexes.last.lengths.merge!(row[:Column_name] => row[:Sub_part].to_i) if row[:Sub_part] && mysql_index_type != :spatial
-          end
-        end
-
-        indexes
-      end
-
       def quote(value)
-        if RGeo::Feature::Geometry.check_type(value)
-          "ST_GeomFromWKB(0x#{RGeo::WKRep::WKBGenerator.new(hex_format: true, little_endian: true).generate(value)},#{value.srid})"
+        dbval = value.try(:value_for_database) || value
+        if RGeo::Feature::Geometry.check_type(dbval)
+          "ST_GeomFromWKB(0x#{RGeo::WKRep::WKBGenerator.new(hex_format: true, little_endian: true).generate(dbval)},#{dbval.srid})"
         else
           super
         end

data/lib/active_record/type/spatial.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module Type
     class Spatial < Value # :nodoc:
@@ -14,66 +16,61 @@ module ActiveRecord
 
       # sql_type: geometry, geometry(Point), geometry(Point,4326), ...
       #
-      # returns [geo_type, srid, has_z, has_m]
+      # returns [geo_type, srid]
       #   geo_type: geography, geometry, point, line_string, polygon, ...
       #   srid:     1234
-      #   has_z:    false
-      #   has_m:    false
       def self.parse_sql_type(sql_type)
-        geo_type, srid, has_z, has_m = nil, 0, false, false
+        geo_type, srid = nil, 0, false, false
 
         if sql_type =~ /(geography|geometry)\((.*)\)$/i
+          # geometry(Point)
           # geometry(Point,4326)
           params = Regexp.last_match(2).split(",")
-          if params.size > 1
-            if params.first =~ /([a-z]+[^zm])(z?)(m?)/i
-              has_z = !Regexp.last_match(2).empty?
-              has_m = !Regexp.last_match(3).empty?
-              geo_type = Regexp.last_match(1)
-            end
-            if params.last =~ /(\d+)/
-              srid = Regexp.last_match(1).to_i
-            end
-          else
-            # geometry(Point)
-            geo_type = params[0]
+          if params.first =~ /([a-z]+[^zm])(z?)(m?)/i
+            geo_type = Regexp.last_match(1)
+          end
+          if params.last =~ /(\d+)/
+            srid = Regexp.last_match(1).to_i
           end
         else
           # geometry
+          # otherType(a,b)
           geo_type = sql_type
         end
-        [geo_type, srid, has_z, has_m]
+        [geo_type, srid]
       end
 
-      def klass
-        type == :geometry ? RGeo::Feature::Geometry : super
+      def spatial_factory
+        @spatial_factory ||=
+          RGeo::ActiveRecord::SpatialFactoryStore.instance.factory(
+            geo_type: @geo_type,
+            sql_type: @sql_type,
+            srid: @srid
+          )
       end
 
-      def type
-        :geometry
+      def klass
+        type == :geometry ? RGeo::Feature::Geometry : super
       end
 
       def spatial?
         true
       end
 
-      def spatial_factory
-        @spatial_factory ||=
-          RGeo::ActiveRecord::SpatialFactoryStore.instance.factory(
-            geo_type: @geo_type,
-            sql_type: @sql_type,
-            srid: @srid
-          )
+      def type
+        :geometry
       end
 
       # support setting an RGeo object or a WKT string
       def serialize(value)
         return if value.nil?
+
         geo_value = cast_value(value)
 
         # TODO - only valid types should be allowed
         # e.g. linestring is not valid for point column
         raise "maybe should raise" unless RGeo::Feature::Geometry.check_type(geo_value)
+
         geo_value
       end
 
@@ -81,35 +78,24 @@ module ActiveRecord
 
       def cast_value(value)
         return if value.nil?
-        case value
-        when ::RGeo::Feature::Geometry
-          value
-          # RGeo::Feature.cast(value, spatial_factory) rescue nil
-        when ::String
-          marker = value[4, 1]
-          if marker == "\x00" || marker == "\x01"
-            srid = value[0, 4].unpack(marker == "\x01" ? "V" : "N").first
-            begin
-              RGeo::WKRep::WKBParser.new(spatial_factory, support_ewkb: true, default_srid: srid).parse(value[4..-1])
-            rescue
-              nil
-            end
-          elsif value[0, 10] =~ /[0-9a-fA-F]{8}0[01]/
-            srid = value[0, 8].to_i(16)
-            srid = [srid].pack("V").unpack("N").first if value[9, 1] == "1"
-            begin
-              RGeo::WKRep::WKBParser.new(spatial_factory, support_ewkb: true, default_srid: srid).parse(value[8..-1])
-            rescue
-              nil
-            end
-          else
-            begin
-              RGeo::WKRep::WKTParser.new(spatial_factory, support_ewkt: true, default_srid: @srid).parse(value)
-            rescue
-              nil
-            end
-          end
+
+        ::String === value ? parse_wkt(value) : value
+      end
+
+      def parse_wkt(string)
+        marker = string[4, 1]
+        if marker == "\x00" || marker == "\x01"
+          srid = string[0, 4].unpack(marker == "\x01" ? "V" : "N").first
+          RGeo::WKRep::WKBParser.new(spatial_factory, support_ewkb: true, default_srid: srid).parse(string[4..-1])
+        elsif string[0, 10] =~ /[0-9a-fA-F]{8}0[01]/
+          srid = string[0, 8].to_i(16)
+          srid = [srid].pack("V").unpack("N").first if string[9, 1] == "1"
+          RGeo::WKRep::WKBParser.new(spatial_factory, support_ewkb: true, default_srid: srid).parse(string[8..-1])
+        else
+          RGeo::WKRep::WKTParser.new(spatial_factory, support_ewkt: true, default_srid: @srid).parse(string)
         end
+      rescue RGeo::Error::ParseError, RGeo::Error::InvalidGeometry
+        nil
       end
     end
   end

data/lib/activerecord-mysql2rgeo-adapter.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require "active_record/connection_adapters/mysql2rgeo_adapter"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-mysql2rgeo-adapter
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 6.0.1
 platform: ruby
 authors:
 - Yongdae Hwang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-28 00:00:00.000000000 Z
+date: 2021-04-12 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.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: rgeo-activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -116,7 +116,7 @@ files:
 - lib/activerecord-mysql2rgeo-adapter.rb
 homepage: http://github.com/stadia/activerecord-mysql2rgeo-adapter
 licenses:
-- BSD
+- BSD-3-Clause
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -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:
   - - ">="
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: ActiveRecord adapter for MySQL, based on RGeo.