activerecord-mysql2rgeo-adapter 5.1.0 → 5.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15b85c3b96245dc0cda126756f7cfb2d1d4fc2a93baa86612e283277934d1d73
-  data.tar.gz: 15eb74772a5f2bea2fec482ef2165c23d7e1c195a8e2acfd7642c3cff4c81448
+  metadata.gz: ff6faa5bd2d1fdbd11d39ae470198df22169779733a6a2edfb07bdb316cf8101
+  data.tar.gz: 1466bc545f7d632a47934022ec1ee16755b3d32d92d7b9fb5e470abefd4858ef
 SHA512:
-  metadata.gz: 3e391e6373d02448e9c4344c21f495fe190d0455fb1e9d5692add77291e03b476bfba666f32ec036284bc771a74cf3bb182c78dbcd40b6af84d0918aa83c3beb
-  data.tar.gz: 51c01a9e4d540bf2e5b3d58ccf06491fcc91b93df421e353691ff1698f653bbcc975a4f8c5aae587e03ede8457d27b43bb5c9b46720d3c942bc4856a2659f2dd
+  metadata.gz: 923e9ea973d64cf7503114ce25a88dca5fb1419d9fddad878579a124270a26a7fca55e02364bae8c5822a8d8160635a581539d2b525c3d90bd6bce417f9e8681
+  data.tar.gz: 7fa56cefbadc3afeeb5558f86b6a349adf725eca130bba822a7012e8bd95da0c04ba849501ae950cb34788dab52d9933b096099bc4ba414435b4f0712a0ad176

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.

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module ConnectionAdapters
     module Mysql2Rgeo
@@ -11,38 +13,38 @@ module ActiveRecord
           column(name, :geometry, options)
         end
 
-        def geometrycollection(name, options = {})
+        def geometry_collection(name, options = {})
           column(name, :geometrycollection, options)
         end
-        alias geometry_collection geometrycollection
+        alias geometrycollection geometry_collection
 
-        def point(name, options = {})
-          column(name, :point, options)
+        def line_string(name, options = {})
+          column(name, :linestring, options)
         end
+        alias linestring line_string
 
-        def multipoint(name, options = {})
+        def multi_line_string(name, options = {})
+          column(name, :multilinestring, options)
+        end
+        alias multilinestring multi_line_string
+
+        def multi_point(name, options = {})
           column(name, :multipoint, options)
         end
-        alias multi_point multipoint
+        alias multipoint multi_point
 
-        def linestring(name, options = {})
-          column(name, :linestring, options)
+        def multi_polygon(name, options = {})
+          column(name, :multipolygon, options)
         end
-        alias line_string linestring
+        alias multipolygon multi_polygon
 
-        def multilinestring(name, options = {})
-          column(name, :multilinestring, options)
+        def point(name, options = {})
+          column(name, :point, options)
         end
-        alias multi_line_string multilinestring
 
         def polygon(name, options = {})
           column(name, :polygon, options)
         end
-
-        def multipolygon(name, options = {})
-          column(name, :multipolygon, options)
-        end
-        alias multi_polygon multipolygon
       end
     end
 

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

@@ -15,7 +15,7 @@ module ActiveRecord # :nodoc:
         mysql2_connection(config)
       end
 
-      alias jdbcmysql2rgeo_connection mysql2rgeo_connection
+      alias_method :jdbcmysql2rgeo_connection, :mysql2rgeo_connection
 
     else
 

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

@@ -26,16 +26,15 @@ module ActiveRecord
           # Add spatial types
           # Reference: https://dev.mysql.com/doc/refman/5.6/en/spatial-type-overview.html
           super.merge(
-            spatial: { name: "geometry" },
-            geometry: { name: "geometry" },
-            geometrycollection: { name: "geometrycollection" },
-            point: { name: "point" },
-            linestring: { name: "linestring" },
-            polygon: { name: "polygon" },
-            multipoint: { name: "multipoint" },
-            multi_point: { name: "multipoint" },
-            multi_linestring: { name: "multilinestring" },
-            multi_polygon: { name: "multipolygon" }
+            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
 
@@ -72,7 +71,7 @@ module ActiveRecord
           end
 
           SpatialColumn.new(
-            field[:Field],
+              field[:Field],
               default,
               type_metadata,
               field[:Null] == "YES",
@@ -81,16 +80,6 @@ module ActiveRecord
               field[:Collation],
               comment: field[:Comment].presence
           )
-          # MySQL::Column.new(
-          #     field[:Field],
-          #     default,
-          #     type_metadata,
-          #     field[:Null] == "YES",
-          #     table_name,
-          #     default_function,
-          #     field[:Collation],
-          #     comment: field[:Comment].presence
-          # )
         end
       end
     end

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

@@ -34,9 +34,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 +65,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/version.rb

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

data/lib/active_record/connection_adapters/mysql2rgeo_adapter.rb

@@ -27,7 +27,6 @@ require "active_record/connection_adapters/mysql2rgeo/create_connection"
 
 # :startdoc:
 
-# ActiveRecord::ConnectionAdapters::Mysql2RgeoAdapter
 module ActiveRecord
   module ConnectionAdapters
     class Mysql2RgeoAdapter < Mysql2Adapter
@@ -35,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
@@ -53,7 +52,6 @@ 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

data/lib/active_record/type/spatial.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module Type
     class Spatial < Value # :nodoc:
@@ -14,53 +16,49 @@ 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
       def self.parse_sql_type(sql_type)
         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
-              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]
       end
 
-      def klass
-        puts type
-        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
@@ -78,35 +76,23 @@ 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
+        nil
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-mysql2rgeo-adapter
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.2.2
 platform: ruby
 authors:
 - Yongdae Hwang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-21 00:00:00.000000000 Z
+date: 2019-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord