activerecord-mysql2rgeo-adapter 6.1.1 → 7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc08589944b261d0dca6908f375c8453eae76a29ff3da7a6c76f264fac0400dd
-  data.tar.gz: a3682118ef63d2605688f0f2c81713af2c58987a42f40425baff6f58326bf059
+  metadata.gz: 8477b01680100a780afd5d1a41bbb7124e4e9442b7aa026a29741ec7fe729e42
+  data.tar.gz: 7e680ac1a09feb227b8b5111c7de278509982ea713f8146f56a55d43c212bcad
 SHA512:
-  metadata.gz: 6a791e518607f77b3fa3affcca3402498d669d8011613c33e811db57278096382b87897a1477b8b18a66c4175ecd419ed161dd57a050b837b6e160943108158a
-  data.tar.gz: 03d6461ef1db07a0deedba7d5843bf6e9a4a00927de6f5e3b6c1ecf8834e1c95494d6ff03b56d0b08aeab675a4e39cea1e7623808507e5b4c62270f3e540a82f
+  metadata.gz: 1060dd9a7840478e5d40aafc15c4fcbb51128d8e9d2455f66ddb1b53d81747284a697a014ecfefa8da661c61e30cd5af51a3d32804b6545472f90cc6552e008b
+  data.tar.gz: bf5144c40e65da867e7abd9a67370af09e78f2cf0bb25328651c5b3a977161d35495d70ef80a3ac40f3a946b3b3933679d95afe76533720690022241ef9d19be

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

@@ -7,36 +7,13 @@ module ActiveRecord
         private
 
           def add_column_options!(sql, options)
-            # By default, TIMESTAMP columns are NOT NULL, cannot contain NULL values,
-            # and assigning NULL assigns the current timestamp. To permit a TIMESTAMP
-            # column to contain NULL, explicitly declare it with the NULL attribute.
-            # See https://dev.mysql.com/doc/refman/en/timestamp-initialization.html
-            if /\Atimestamp\b/.match?(options[:column].sql_type) && !options[:primary_key]
-              sql << " NULL" unless options[:null] == false || options_include_default?(options)
-            end
-
             if options[:srid]
               sql << " /*!80003 SRID #{options[:srid]} */"
             end
 
-            if charset = options[:charset]
-              sql << " CHARACTER SET #{charset}"
-            end
-
-            if collation = options[:collation]
-              sql << " COLLATE #{collation}"
-            end
-
-            if as = options[:as]
-              sql << " AS (#{as})"
-              if options[:stored]
-                sql << (mariadb? ? " PERSISTENT" : " STORED")
-              end
-            end
-
-            add_sql_comment!(super, options[:comment])
+            super
           end
       end
     end
   end
-end
+end

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

@@ -26,42 +26,6 @@ module ActiveRecord
           super
         end
 
-        # override
-        def native_database_types
-          # Add spatial types
-          # Reference: https://dev.mysql.com/doc/refman/5.6/en/spatial-type-overview.html
-          super.merge(
-            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
-
-        def initialize_type_map(m = type_map)
-          super
-
-          %w[
-            geometry
-            geometrycollection
-            point
-            linestring
-            polygon
-            multipoint
-            multilinestring
-            multipolygon
-          ].each do |geo_type|
-            m.register_type(geo_type) do |sql_type|
-              Type::Spatial.new(sql_type)
-            end
-          end
-        end
-
         private
 
         # override

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

@@ -3,7 +3,7 @@
 module ActiveRecord
   module ConnectionAdapters
     module Mysql2Rgeo
-      VERSION = "6.1.1"
+      VERSION = "7.0.1"
     end
   end
 end

data/lib/active_record/connection_adapters/mysql2rgeo_adapter.rb

@@ -80,6 +80,50 @@ module ActiveRecord
         DEFAULT_SRID
       end
 
+      def native_database_types
+        # Add spatial types
+        # Reference: https://dev.mysql.com/doc/refman/5.6/en/spatial-type-overview.html
+        super.merge(
+          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
+
+      class << self
+
+        private
+          def initialize_type_map(m)
+            super
+
+            %w[
+              geometry
+              geometrycollection
+              point
+              linestring
+              polygon
+              multipoint
+              multilinestring
+              multipolygon
+            ].each do |geo_type|
+              m.register_type(geo_type) do |sql_type|
+                Type::Spatial.new(sql_type.to_s)
+              end
+            end
+          end
+      end
+
+      TYPE_MAP = Type::TypeMap.new.tap { |m| initialize_type_map(m) }
+      TYPE_MAP_WITH_BOOLEAN = Type::TypeMap.new(TYPE_MAP).tap do |m|
+        m.register_type %r(^tinyint\(1\))i, Type::Boolean.new
+      end
+
       def supports_spatial?
         !mariadb? && version >= "5.7.6"
       end
@@ -92,6 +136,11 @@ module ActiveRecord
           super
         end
       end
+
+      private
+        def type_map
+          emulate_booleans ? TYPE_MAP_WITH_BOOLEAN : TYPE_MAP
+        end
     end
   end
 end

data/lib/active_record/type/spatial.rb

@@ -40,7 +40,9 @@ module ActiveRecord
       end
 
       def spatial_factory
-        @spatial_factory ||=
+        @spatial_factories ||= {}
+
+        @spatial_factories[@srid] ||=
           RGeo::ActiveRecord::SpatialFactoryStore.instance.factory(
             geo_type: @geo_type,
             sql_type: @sql_type,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-mysql2rgeo-adapter
 version: !ruby/object:Gem::Version
-  version: 6.1.1
+  version: 7.0.1
 platform: ruby
 authors:
 - Yongdae Hwang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-13 00:00:00.000000000 Z
+date: 2023-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
   name: rgeo-activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -127,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="