activerecord-mysql2rgeo-adapter 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ae61ad75e0c3b01f1fcb7b01a1646c415126fbe
-  data.tar.gz: f61144159cbcc55ade3b14bf0d52b7f843571ea4
+  metadata.gz: 3a35cacf27708b88079361795afb35a4673ceb7c
+  data.tar.gz: af091d82862dabd35ebeaf824402ff41549d0250
 SHA512:
-  metadata.gz: 166a724c80d6d2c7ff032fec44a0954a9f463b673c6c36611b9b42c9532920d8e37ac004a7fe65730eef98445d9433bea12331be90654242e622148caa8fe879
-  data.tar.gz: 45b5b5326a89185c8554ad234881188173ded6e01c9e8511dc82b4931583bbe27ccd0ef69b28fac7ef2f2d76dd4ff41bf678abea55ad1e1eb9ec77b439d3dffe
+  metadata.gz: 6a3c6341b3d00589d31a4fddb8a8cbbbbfa0f20a411fedf02f48953f8cdb81fcc7b90617e1f4e00a38440927208f76487d5758138c2994fac2a751340cf767a4
+  data.tar.gz: 30c1d75c52971c065ff6f39c37dd015cd40781a7638bba5eb5ee86607d5fd3c2da73b3bceded05a681ca966922d11d2516d766834904d1f11cf0b94bb2522d54

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/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

@@ -8,16 +8,12 @@ module ActiveRecord
         end
 
         def type_to_sql(type, limit = nil, precision = nil, scale = nil, array = nil)
-          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 == "spatial"
             type = type.to_s.delete("_").upcase
           end
-          super(type, limit, precision, scale, array)
-        end
-
-        def spatial_column_constructor(name)
-          RGeo::ActiveRecord::DEFAULT_SPATIAL_COLUMN_CONSTRUCTORS[name]
+          super
         end
 
         # override

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

@@ -1,7 +1,7 @@
 module ActiveRecord
   module ConnectionAdapters
     module Mysql2Rgeo
-      VERSION = "1.0.4".freeze
+      VERSION = "1.0.5".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"
@@ -39,8 +46,6 @@ module ActiveRecord
       # 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?
@@ -45,25 +45,25 @@ module ActiveRecord
         [geo_type, srid, has_z, has_m]
       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

metadata

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