activerecord-postgis 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85a0e8ab2ce4078be403c88613a3f3cbd5e75b5eb10513c17a4bd907a32f3932
-  data.tar.gz: f742b5aea859d34e0ecb5886e14e29dc5e0741aba3203436d92bcf41f5fb4f8a
+  metadata.gz: c4caab5fe6b63c11ebb789f2e77cb8997ac1c495333cc08e2cba397e043916fa
+  data.tar.gz: a8688b2c439daf278f07fe7c9ff00fd791ef82f964a74f0032ec088e5a495144
 SHA512:
-  metadata.gz: 72576fb86dcbecf612b6e887b797ca6da99f8a7d48f53c6f5428e55bd93650f6b51d9166a948fe3ad8cde910da4a1f69ad34751ee17d0b1a8c513d6434a386c8
-  data.tar.gz: ce5ce36d298aa6532284bf0c5b01f6f2ec5a395559a08bc4114c8dff9cf8f47b9a9079edab5edee896eaece08b506b67a813756f6e2d8ac800ee8d6846cc9f1f
+  metadata.gz: 55b212ec58aff548cd55062d88728b75383859b246a66cd49cda54e1f86d2acde0ad3b6a3df8d921e4e7678efe99c9898f78efa4557e978b9361e520996bd823
+  data.tar.gz: 5c33782d1350c14a8f8bf1edbe3ae8495bd40527293241f80e5d6b140f964c70b953d2f3fc8b513a1c5df8fb218c896540d6fcc80645ef4573c7e7460abc11e0

data/lib/active_record/connection_adapters/postgis/spatial_column_type.rb

@@ -25,9 +25,9 @@ module ActiveRecord
                 has_z = geo_part.end_with?("Z") || geo_part.end_with?("ZM")
                 has_m = geo_part.end_with?("M") || geo_part.end_with?("ZM")
               end
-            elsif o.limit.is_a?(String) && o.limit.include?(",")
+            elsif o.options[:limit].is_a?(String) && o.options[:limit].include?(",")
               # Fallback to parsing limit string (for schema loading)
-              geo_part, srid_part = o.limit.split(",", 2)
+              geo_part, srid_part = o.options[:limit].split(",", 2)
               srid = srid_part.to_i if srid_part && !srid_part.empty?
               if geo_part
                 has_z = geo_part.end_with?("Z") || geo_part.end_with?("ZM")
@@ -42,9 +42,9 @@ module ActiveRecord
             end
 
             sql_type = type_to_sql(o.type.to_sym,
-                                   limit: o.options[:spatial_sql] || o.limit,
-                                   precision: o.precision,
-                                   scale: o.scale,
+                                   limit: o.options[:spatial_sql] || o.options[:limit],
+                                   precision: o.options[:precision],
+                                   scale: o.options[:scale],
                                    srid: srid,
                                    geographic: geographic,
                                    has_z: has_z,

data/lib/active_record/connection_adapters/postgis/table_definition.rb

@@ -22,8 +22,9 @@ module ActiveRecord
           end
 
           if spatial_column_type?(col_type)
-            if (limit = options.delete(:limit)) && limit.is_a?(::Hash)
-              options.merge!(limit)
+            case (limit = options.delete(:limit))
+            when ::Hash then options.merge!(limit)
+            when ::String then options.reverse_merge!(ColumnDefinitionUtils.options_from_limit(limit))
             end
 
             # Set geographic option for geography types
@@ -125,6 +126,17 @@ module ActiveRecord
             end
           end
 
+          # Inverse of limit_from_options: "POINTZ,4326" => { srid: 4326, has_z: true }
+          def options_from_limit(limit)
+            geo_part, srid_part = limit.split(",", 2)
+            dimensions = geo_part.to_s.upcase[/(ZM|Z|M)\z/].to_s
+            options = {}
+            options[:srid] = Integer(srid_part) if srid_part.present?
+            options[:has_z] = true if dimensions.include?("Z")
+            options[:has_m] = true if dimensions.include?("M")
+            options
+          end
+
           def limit_from_options(type, options = {})
             has_z = options[:has_z] ? "Z" : ""
             has_m = options[:has_m] ? "M" : ""

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

@@ -3,7 +3,7 @@
 module ActiveRecord
   module ConnectionAdapters
     module PostGIS
-      VERSION = "0.6.1"
+      VERSION = "0.6.2"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgis
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Abdelkader Boudih
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.20
 specification_version: 4
 summary: PostGIS Type support for ActiveRecord
 test_files: []