Merge pull request grimzy#129 from grimzy/issue-58-fix-retrieving-empty-geometry-collection-mysql-5.6

grimzy · web-flow · commit 56a9dc6db68d · 2020-03-08T22:34:46.000-04:00
Fix issue where the WKB of empty GeometryCollections was not getting parsed (MySQL 5.6)
diff --git a/src/Eloquent/SpatialTrait.php b/src/Eloquent/SpatialTrait.php
@@ -95,7 +95,7 @@ public function setRawAttributes(array $attributes, $sync = false)
         $spatial_fields = $this->getSpatialFields();
 
         foreach ($attributes as $attribute => &$value) {
-            if (in_array($attribute, $spatial_fields) && is_string($value) && strlen($value) >= 15) {
+            if (in_array($attribute, $spatial_fields) && is_string($value) && strlen($value) >= 13) {
                 $value = Geometry::fromWKB($value);
             }
         }
diff --git a/tests/Integration/Models/GeometryModel.php b/tests/Integration/Models/GeometryModel.php
@@ -9,5 +9,5 @@ class GeometryModel extends Model
 
     protected $table = 'geometry';
 
-    protected $spatialFields = ['location', 'line'];
+    protected $spatialFields = ['location', 'line', 'multi_geometries'];
 }
diff --git a/tests/Integration/SpatialTest.php b/tests/Integration/SpatialTest.php
@@ -184,6 +184,9 @@ public function testInsertEmptyGeometryCollection()
         $geo->multi_geometries = new GeometryCollection([]);
         $geo->save();
         $this->assertDatabaseHas('geometry', ['id' => $geo->id]);
+
+        $geo2 = GeometryModel::find($geo->id);
+        $this->assertNull($geo2->multi_geometries); // MySQL 5.6 saves null instead of empty GeometryCollection
     }
 
     public function testUpdate()

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public function setRawAttributes(array $attributes, $sync = false)`
`95`	`95`	`$spatial_fields = $this->getSpatialFields();`
`96`	`96`
`97`	`97`	`foreach ($attributes as $attribute => &$value) {`
`98`		`- if (in_array($attribute, $spatial_fields) && is_string($value) && strlen($value) >= 15) {`
	`98`	`+ if (in_array($attribute, $spatial_fields) && is_string($value) && strlen($value) >= 13) {`
`99`	`99`	`$value = Geometry::fromWKB($value);`
`100`	`100`	`}`
`101`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,5 @@ class GeometryModel extends Model`
`9`	`9`
`10`	`10`	`protected $table = 'geometry';`
`11`	`11`
`12`		`- protected $spatialFields = ['location', 'line'];`
	`12`	`+ protected $spatialFields = ['location', 'line', 'multi_geometries'];`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -184,6 +184,9 @@ public function testInsertEmptyGeometryCollection()`
`184`	`184`	`$geo->multi_geometries = new GeometryCollection([]);`
`185`	`185`	`$geo->save();`
`186`	`186`	`$this->assertDatabaseHas('geometry', ['id' => $geo->id]);`
	`187`	`+`
	`188`	`+ $geo2 = GeometryModel::find($geo->id);`
	`189`	`+ $this->assertNull($geo2->multi_geometries); // MySQL 5.6 saves null instead of empty GeometryCollection`
`187`	`190`	`}`
`188`	`191`
`189`	`192`	`public function testUpdate()`