activerecord-mysql2rgeo-adapter 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea97a0b53d1e086113d42b31c79ae3afe8595fef
-  data.tar.gz: 8f292a2708c744814b8932113e88270192e6aefe
+  metadata.gz: 347e7b8819994c6d6759e88a5ab6af2b580650bd
+  data.tar.gz: 8e1aba30818aae96723909abb47da9f304cb7896
 SHA512:
-  metadata.gz: 53725d357c6c360993a4a24ba9accd78f6e5fe18c961ad2492b8dacd967d72c2b905673f82b1504d80b760dd554cda7332c5cb0eaeb972d3c0161cdaaf3e78d9
-  data.tar.gz: fd0da5355832e57506425040a2714f2eec7f482aa095aae1f55e67bfa6b711e93da8a078c895a3487f9db273819beefad7ad9db475ba16ef7b6c6d1d009dbbcc
+  metadata.gz: c91c8e58ceeef1a4d0482969d52df5abd15008b97580804ef7fde65a4dd6377b8d91f2adc289957d5ec5211ecc5c15862440412f6851d8efa7494c8ad8fd49ba
+  data.tar.gz: 9f772f1d2501e46e9cf7a0982ef73fa06809b17aad795e2ecb6e5307a3f538f1f2e56b904216ca2d50fb9f665e26d702716f0b8d3b11033a270d4fb75996f1b1

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

@@ -8,18 +8,14 @@ module ActiveRecord
         end
 
         def type_to_sql(type, limit: nil, precision: nil, scale: nil, unsigned: nil, **) # :nodoc:
-          if (info = spatial_column_constructor(type.to_sym))
+          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.to_s.eql? 'spatial'
+            type = :geometry if type.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/version.rb

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

data/lib/active_record/connection_adapters/mysql2rgeo_adapter.rb

@@ -3,15 +3,22 @@
 
 # :stopdoc:
 
-require "active_record/connection_adapters/mysql2_adapter"
 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 "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"
@@ -34,13 +41,11 @@ module ActiveRecord
           spatial: { type: "geometry" },
           point: {},
           polygon: {}
-        }
+        }.freeze
 
       # 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
 
@@ -48,6 +53,10 @@ 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

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(1).split(",")
+          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?
@@ -84,7 +84,7 @@ module ActiveRecord
         case value
         when ::RGeo::Feature::Geometry
           value
-        # RGeo::Feature.cast(value, spatial_factory) rescue nil
+          # RGeo::Feature.cast(value, spatial_factory) rescue nil
         when ::String
           marker = value[4, 1]
           if marker == "\x00" || marker == "\x01"
@@ -109,7 +109,7 @@ module ActiveRecord
               nil
             end
           end
-          end
+        end
       end
     end
   end

data/lib/activerecord-mysql2rgeo-adapter.rb

@@ -1 +1 @@
-require "active_record/connection_adapters/mysql2rgeo_adapter.rb"
+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.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Yongdae Hwang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-08 00:00:00.000000000 Z
+date: 2017-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -28,16 +28,16 @@ dependencies:
   name: rgeo-activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.1
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.1
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement