Merge pull request #129 from grimzy/issue-58-fix-retrieving-empty-geo…

…metry-collection-mysql-5.6 Fix issue where the WKB of empty GeometryCollections was not getting parsed (MySQL 5.6)
grimzy · Mar 9, 2020 · 56a9dc6 · 56a9dc6
2 parents 5ff4b7f + 9e1bd59
commit 56a9dc6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
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()