activerecord-mysql2rgeo-adapter 1.0.5 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a35cacf27708b88079361795afb35a4673ceb7c
-  data.tar.gz: af091d82862dabd35ebeaf824402ff41549d0250
+  metadata.gz: 4e104b5ca105eca258b3f33c14d39f9b91bce1c7
+  data.tar.gz: 0edc4678c578439e316521489d3efc06aa01b0e3
 SHA512:
-  metadata.gz: 6a3c6341b3d00589d31a4fddb8a8cbbbbfa0f20a411fedf02f48953f8cdb81fcc7b90617e1f4e00a38440927208f76487d5758138c2994fac2a751340cf767a4
-  data.tar.gz: 30c1d75c52971c065ff6f39c37dd015cd40781a7638bba5eb5ee86607d5fd3c2da73b3bceded05a681ca966922d11d2516d766834904d1f11cf0b94bb2522d54
+  metadata.gz: 60ac7b3f8914b1af31384ba388401a576e16f04a19dbb8d8d445db1836efbe10cd13b1f9bf8f2714ffc53e2e83ffc97da6fc6cfac272a2be3f16df87c2394050
+  data.tar.gz: 72a7672833e9ed25832df5aff7c2db1bc11b4f594e745cfcf601749459b9fde5057e2100c40829f3fc080917a7b9c29af8db9c205524872e68cd1fd17c541d0f

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
-    end
 
-    MySQL::Table.include Mysql2Rgeo::ColumnMethods
+      MySQL::Table.send(:include, ColumnMethods)
+    end
   end
 end

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

@@ -4,8 +4,8 @@ else
   require "mysql2"
 end
 
-module ActiveRecord  # :nodoc:
-  module ConnectionHandling  # :nodoc:
+module ActiveRecord # :nodoc:
+  module ConnectionHandling # :nodoc:
     if RUBY_ENGINE == "jruby"
 
       def jdbcmysql2rgeo_connection(config)

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

@@ -7,15 +7,19 @@ module ActiveRecord
           SpatialColumn.new(*args)
         end
 
-        def type_to_sql(type, limit = nil, precision = nil, scale = nil, array = nil)
-          if (info = RGeo::ActiveRecord.geometric_type_from_name(type.to_s.delete("_")))
+        def type_to_sql(type, limit: nil, precision: nil, scale: nil, unsigned: nil, **) # :nodoc:
+          if (info = spatial_column_constructor(type.to_sym))
             type = limit[:type] || type if limit.is_a?(::Hash)
-            type = "geometry" if type.to_s == "spatial"
+            type = 'geometry' if type.to_s.eql? 'spatial'
             type = type.to_s.delete("_").upcase
           end
           super
         end
 
+        def spatial_column_constructor(name)
+          RGeo::ActiveRecord::DEFAULT_SPATIAL_COLUMN_CONSTRUCTORS[name]
+        end
+
         # override
         def native_database_types
           # Add spatial types

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

@@ -15,4 +15,4 @@ end
 # Allow chaining of spatial expressions from attributes
 Arel::Attribute.send :include, RGeo::ActiveRecord::Mysql2Rgeo::SpatialExpressions
 RGeo::ActiveRecord::SpatialConstantNode.send :include, RGeo::ActiveRecord::Mysql2Rgeo::SpatialExpressions
-RGeo::ActiveRecord::SpatialNamedFunction.send :include, RGeo::ActiveRecord::Mysql2Rgeo::SpatialExpressions
+RGeo::ActiveRecord::SpatialNamedFunction.send :include, RGeo::ActiveRecord::Mysql2Rgeo::SpatialExpressions

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

@@ -11,64 +11,34 @@ module ActiveRecord  # :nodoc:
               options.merge!(limit) if limit.is_a?(::Hash)
             end
 
-            geo_type = ColumnDefinition.geo_type(options[:type] || type || info[:type])
+            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)
-            column.spatial_type = geo_type
-            column.srid = options[:srid]
           else
             column = super(name, type, options)
           end
 
           column
         end
-
-        private
-
-        def create_column_definition(name, type)
-          if Mysql2RgeoAdapter.spatial_column_options(type.to_sym)
-            Mysql2Rgeo::ColumnDefinition.new(name, type)
-          else
-            super
-          end
-        end
       end
 
-      class ColumnDefinition < MySQL::ColumnDefinition
-        # needs to accept the spatial type? or figure out from limit ?
-
-        def self.geo_type(type = "GEOMETRY")
-          g_type = type.to_s.delete("_").upcase
-          return "POINT" if g_type == "POINT"
-          return "POLYGON" if g_type == "POLYGON"
-          g_type
-        end
-
-        def spatial_type
-          @spatial_type
-        end
-
-        def spatial_type=(value)
-          @spatial_type = value.to_s
-        end
+      SpatialIndexDefinition = Struct.new(*IndexDefinition.members, :spatial)
 
-        def srid
-          if @srid
-            @srid.to_i
-          else
-            Mysql2RgeoAdapter::DEFAULT_SRID
+      module ColumnDefinitionUtils
+        class << self
+          def geo_type(type = "GEOMETRY")
+            type.to_s.delete('_').upcase
           end
-        end
 
-        def srid=(value)
-          @srid = value
+          def default_srid(options)
+            options[:geographic] ? 4326 : Mysql2RgeoAdapter::DEFAULT_SRID
+          end
         end
       end
-
-      SpatialIndexDefinition = Struct.new(*IndexDefinition.members, :spatial)
     end
   end
 end

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

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

data/lib/active_record/connection_adapters/mysql2rgeo_adapter.rb

@@ -3,22 +3,15 @@
 
 # :stopdoc:
 
-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/mysql2_adapter"
+require "rgeo/active_record"
 require "active_record/connection_adapters/mysql2rgeo/version"
 require "active_record/connection_adapters/mysql2rgeo/column_methods"
 require "active_record/connection_adapters/mysql2rgeo/schema_statements"
 require "active_record/connection_adapters/mysql2rgeo/spatial_table_definition"
 require "active_record/connection_adapters/mysql2rgeo/spatial_column"
 require "active_record/connection_adapters/mysql2rgeo/spatial_expressions"
+require "arel/visitors/bind_visitor"
 require "active_record/connection_adapters/mysql2rgeo/arel_tosql"
 require "active_record/type/spatial"
 require "active_record/connection_adapters/mysql2rgeo/create_connection"
@@ -35,17 +28,19 @@ module ActiveRecord
           geometry: {},
           geometrycollection: {},
           linestring: {},
-          spatial: { type: "geometry" }.freeze,
-          point: {},
-          polygon: {},
           multilinestring: {},
           multipoint: {},
           multipolygon: {},
-        }.freeze
+          spatial: { type: "geometry" },
+          point: {},
+          polygon: {}
+        }
 
       # http://postgis.17.x6.nabble.com/Default-SRID-td5001115.html
       DEFAULT_SRID = 0
 
+      ADAPTER_NAME = "Mysql2Rgeo".freeze
+
       def initialize(connection, logger, connection_options, config)
         super
 
@@ -53,10 +48,6 @@ module ActiveRecord
         @visitor.extend(DetermineIfPreparableVisitor) if self.class.type_cast_config_to_boolean(config.fetch(:prepared_statements) { true })
       end
 
-      def adapter_name
-        "Mysql2Rgeo".freeze
-      end
-
       def self.spatial_column_options(key)
         SPATIAL_COLUMN_OPTIONS[key]
       end
@@ -66,11 +57,17 @@ module ActiveRecord
       end
 
       def supports_spatial?
-        !mariadb? && version >= '5.7.6'
+        !mariadb? && version >= "5.7.6"
       end
 
       # Returns an array of indexes for the given table.
-      def indexes(table_name, _name = nil) #:nodoc:
+      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|
@@ -87,7 +84,7 @@ module ActiveRecord
                            options.push(true)
                            Mysql2Rgeo::SpatialIndexDefinition.new(*options)
                          else
-                           IndexDefinition.new(*options)
+                           IndexDefinition.new(row[:Table], row[:Key_name], row[:Non_unique].to_i == 0, [], {}, nil, nil, index_type, index_using, row[:Index_comment].presence)
                          end
             end
 
@@ -99,7 +96,7 @@ module ActiveRecord
         indexes
       end
 
-      def quote(value, column = nil)
+      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})"
         else

data/lib/active_record/type/spatial.rb

@@ -22,9 +22,9 @@ module ActiveRecord
       def self.parse_sql_type(sql_type)
         geo_type, srid, has_z, has_m = nil, 0, false, false
 
-        if sql_type =~ /(geography|geometry)\((.*)\)$/i
+        if sql_type =~ /[geography,geometry]\((.*)\)$/i
           # geometry(Point,4326)
-          params = Regexp.last_match(2).split(",")
+          params = Regexp.last_match(1).split(",")
           if params.size > 1
             if params.first =~ /([a-z]+[^zm])(z?)(m?)/i
               has_z = !Regexp.last_match(2).empty?
@@ -45,25 +45,25 @@ module ActiveRecord
         [geo_type, srid, has_z, has_m]
       end
 
-      def spatial_factory
-        @spatial_factory ||=
-            RGeo::ActiveRecord::SpatialFactoryStore.instance.factory(
-                geo_type: @geo_type,
-                sql_type: @sql_type,
-                srid: @srid
-            )
-      end
-
       def klass
         type == :geometry ? RGeo::Feature::Geometry : super
       end
 
+      def type
+        :geometry
+      end
+
       def spatial?
         true
       end
 
-      def type
-        :geometry
+      def spatial_factory
+        @spatial_factory ||=
+          RGeo::ActiveRecord::SpatialFactoryStore.instance.factory(
+            geo_type: @geo_type,
+            sql_type: @sql_type,
+            srid: @srid
+          )
       end
 
       # support setting an RGeo object or a WKT string
@@ -82,24 +82,34 @@ 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
-              RGeo::WKRep::WKBParser.new(spatial_factory, support_ewkb: true, default_srid: srid).parse(value[4..-1]) rescue nil
-            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'
-              RGeo::WKRep::WKBParser.new(spatial_factory, support_ewkb: true, default_srid: srid).parse(value[8..-1]) rescue nil
-            else
-              RGeo::WKRep::WKTParser.new(spatial_factory, support_ewkt: true, default_srid: @srid).parse(value) rescue nil
+        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
-            nil
-        end
+            begin
+              RGeo::WKRep::WKTParser.new(spatial_factory, support_ewkt: true, default_srid: @srid).parse(value)
+            rescue
+              nil
+            end
+          end
+          end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-mysql2rgeo-adapter
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 2.0.1
 platform: ruby
 authors:
 - Yongdae Hwang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-12 00:00:00.000000000 Z
+date: 2017-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: rgeo-activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '5.1'
 - !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.11
 signing_key: 
 specification_version: 4
 summary: ActiveRecord adapter for MySQL, based on RGeo.