activerecord-mysql2rgeo-adapter 2.2.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 916dd6c6a2f329f0476e864abd896923ff9703d5
-  data.tar.gz: d223eee1c5f0985e9a22cccb2a1b3f16fb5b1111
+SHA256:
+  metadata.gz: 15b85c3b96245dc0cda126756f7cfb2d1d4fc2a93baa86612e283277934d1d73
+  data.tar.gz: 15eb74772a5f2bea2fec482ef2165c23d7e1c195a8e2acfd7642c3cff4c81448
 SHA512:
-  metadata.gz: 9fd772f34bf93e71654c74ce98716817faf2e67f353fa01cf92dd18714b8c9a218e4b4e648d32338c1f1546d60a1c940b8d31e8f6f758074cc7daada4d9fa76b
-  data.tar.gz: c79130a963ea11b357dbb0c50f21c660299c0fed59c739e3bf35bb36b7a287fded05a0de3ab3122b5fd826b7ef237b73b8c532ae084f16be659bd359dd32f76b
+  metadata.gz: 3e391e6373d02448e9c4344c21f495fe190d0455fb1e9d5692add77291e03b476bfba666f32ec036284bc771a74cf3bb182c78dbcd40b6af84d0918aa83c3beb
+  data.tar.gz: 51c01a9e4d540bf2e5b3d58ccf06491fcc91b93df421e353691ff1698f653bbcc975a4f8c5aae587e03ede8457d27b43bb5c9b46720d3c942bc4856a2659f2dd

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

@@ -5,7 +5,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

@@ -3,45 +3,45 @@ module ActiveRecord
     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)
+          raise "You must set a type. For example: 't.spatial type: :st_point'" unless options[:type]
+          column(name, options[:type], options)
         end
 
-        def geometry(*args, multi: false, **options)
-          multi ? multi_geometry(*args, **options) : args.each { |name| column(name, :geometry, options) }
+        def geometry(name, options = {})
+          column(name, :geometry, options)
         end
 
-        def geometrycollection(*args, **options)
-          args.each { |name| column(name, :geometrycollection, options) }
+        def geometrycollection(name, options = {})
+          column(name, :geometrycollection, options)
         end
+        alias geometry_collection geometrycollection
 
-        def point(*args, multi: false, **options)
-          multi ? multi_point(*args, **options) : args.each { |name| column(name, :point, options) }
+        def point(name, options = {})
+          column(name, :point, options)
         end
 
-        def multipoint(*args, **options)
-          args.each { |name| column(name, :multipoint, options) }
+        def multipoint(name, options = {})
+          column(name, :multipoint, options)
         end
+        alias multi_point multipoint
 
-        def linestring(*args, multi: false, **options)
-          multi ? multi_linestring(*args, **options) : args.each { |name| column(name, :linestring, options) }
+        def linestring(name, options = {})
+          column(name, :linestring, options)
         end
+        alias line_string linestring
 
-        def multilinestring(*args, **options)
-          args.each { |name| column(name, :multilinestring, options) }
+        def multilinestring(name, options = {})
+          column(name, :multilinestring, options)
         end
+        alias multi_line_string multilinestring
 
-        def polygon(*args, multi: false, **options)
-          multi ? multipolygon(*args, **options) : args.each { |name| column(name, :polygon, options) }
+        def polygon(name, options = {})
+          column(name, :polygon, options)
         end
 
-        def multipolygon(*args, **options)
-          args.each { |name| column(name, :multipolygon, options) }
+        def multipolygon(name, options = {})
+          column(name, :multipolygon, options)
         end
-
-        alias multi_point multipoint
-        alias multi_geometry geometrycollection
-        alias multi_linestring multilinestring
         alias multi_polygon multipolygon
       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
@@ -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,21 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module ConnectionAdapters
     module Mysql2Rgeo
       module SchemaStatements
         # 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 +24,29 @@ 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(
+            spatial: { name: "geometry" },
             geometry: { name: "geometry" },
+            geometrycollection: { name: "geometrycollection" },
             point: { name: "point" },
             linestring: { name: "linestring" },
             polygon: { name: "polygon" },
-            multi_geometry: { name: "geometrycollection" },
+            multipoint: { name: "multipoint" },
             multi_point: { name: "multipoint" },
             multi_linestring: { name: "multilinestring" },
-            multi_polygon: { name: "multipolygon" },
-            spatial: { name: "geometry", limit: { type: :point } }
+            multi_polygon: { name: "multipolygon" }
           )
         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 +54,44 @@ module ActiveRecord
             m.register_type(geo_type, Type::Spatial.new(geo_type))
           end
         end
+
+        private
+
+        # override
+        def create_table_definition(*args)
+          Mysql2Rgeo::TableDefinition.new(*args)
+        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",
+              table_name,
+              default_function,
+              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
   end

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

@@ -1,7 +1,7 @@
 module ActiveRecord
   module ConnectionAdapters
     module Mysql2Rgeo
-      VERSION = "2.2.0".freeze
+      VERSION = "5.1.0".freeze
     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.
 
@@ -25,6 +27,7 @@ require "active_record/connection_adapters/mysql2rgeo/create_connection"
 
 # :startdoc:
 
+# ActiveRecord::ConnectionAdapters::Mysql2RgeoAdapter
 module ActiveRecord
   module ConnectionAdapters
     class Mysql2RgeoAdapter < Mysql2Adapter
@@ -50,11 +53,11 @@ 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 })
+        # @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 +72,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

@@ -17,18 +17,14 @@ module ActiveRecord
       # returns [geo_type, srid, has_z, has_m]
       #   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,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+)/
@@ -42,10 +38,11 @@ module ActiveRecord
           # geometry
           geo_type = sql_type
         end
-        [geo_type, srid, has_z, has_m]
+        [geo_type, srid]
       end
 
       def klass
+        puts type
         type == :geometry ? RGeo::Feature::Geometry : super
       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: 5.1.0
 platform: ruby
 authors:
 - Yongdae Hwang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-28 00:00:00.000000000 Z
+date: 2019-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -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.