Merge pull request #263 from kitloong/feature/spatial

Remove unsupported spatial column types

Author: kitloong

src/Database/Models/MySQL/MySQLColumn.php

@@ -87,14 +87,7 @@ public function __construct(string $table, array $column)
 
             case ColumnType::GEOGRAPHY:
             case ColumnType::GEOMETRY:
-            case ColumnType::GEOMETRY_COLLECTION:
-            case ColumnType::LINE_STRING:
-            case ColumnType::MULTI_LINE_STRING:
-            case ColumnType::POINT:
-            case ColumnType::MULTI_POINT:
-            case ColumnType::POLYGON:
-            case ColumnType::MULTI_POLYGON:
-                $this->setRealSpatialColumn();
+                $this->setRealSpatialColumn($column['type_name']);
                 break;
 
             default:
@@ -248,34 +241,35 @@ private function setStoredDefinition(): void
     /**
      * Set to geometry or geography.
      */
-    private function setRealSpatialColumn(): void
+    private function setRealSpatialColumn(string $typeName): void
     {
-        switch ($this->type) {
-            case ColumnType::GEOMETRY_COLLECTION:
+        switch ($typeName) {
+            case 'geometrycollection':
+            case 'geomcollection':
                 $this->spatialSubType = 'geometryCollection';
                 break;
 
-            case ColumnType::LINE_STRING:
+            case 'linestring':
                 $this->spatialSubType = 'lineString';
                 break;
 
-            case ColumnType::MULTI_LINE_STRING:
+            case 'multilinestring':
                 $this->spatialSubType = 'multiLineString';
                 break;
 
-            case ColumnType::POINT:
+            case 'point':
                 $this->spatialSubType = 'point';
                 break;
 
-            case ColumnType::MULTI_POINT:
+            case 'multipoint':
                 $this->spatialSubType = 'multiPoint';
                 break;
 
-            case ColumnType::POLYGON:
+            case 'polygon':
                 $this->spatialSubType = 'polygon';
                 break;
 
-            case ColumnType::MULTI_POLYGON:
+            case 'multipolygon':
                 $this->spatialSubType = 'multiPolygon';
                 break;
 

src/Database/Models/MySQL/MySQLColumnType.php

@@ -47,20 +47,19 @@ class MySQLColumnType extends DatabaseColumnType
         'varchar'            => ColumnType::STRING,
         'year'               => ColumnType::YEAR,
 
+        'geomcollection'     => ColumnType::GEOMETRY,
+        'linestring'         => ColumnType::GEOMETRY,
+        'multilinestring'    => ColumnType::GEOMETRY,
+        'point'              => ColumnType::GEOMETRY,
+        'multipoint'         => ColumnType::GEOMETRY,
+        'polygon'            => ColumnType::GEOMETRY,
+        'multipolygon'       => ColumnType::GEOMETRY,
+
         // For MariaDB
         'uuid'               => ColumnType::UUID,
 
-        // Removed from Laravel v11
-        'geomcollection'     => ColumnType::GEOMETRY_COLLECTION,
-        'linestring'         => ColumnType::LINE_STRING,
-        'multilinestring'    => ColumnType::MULTI_LINE_STRING,
-        'point'              => ColumnType::POINT,
-        'multipoint'         => ColumnType::MULTI_POINT,
-        'polygon'            => ColumnType::POLYGON,
-        'multipolygon'       => ColumnType::MULTI_POLYGON,
-
-        // For MariaDB
-        'geometrycollection' => ColumnType::GEOMETRY_COLLECTION,
+        // For MariaDB and MySQL57
+        'geometrycollection' => ColumnType::GEOMETRY,
     ];
 
     /**

src/Enum/Migrations/Method/ColumnType.php

@@ -23,23 +23,16 @@ enum ColumnType: string implements MethodName
     case FLOAT                   = 'float';
     case GEOGRAPHY               = 'geography';
     case GEOMETRY                = 'geometry';
-    case GEOMETRY_COLLECTION     = 'geometryCollection';
     case INCREMENTS              = 'increments';
     case INTEGER                 = 'integer';
     case IP_ADDRESS              = 'ipAddress';
     case JSON                    = 'json';
     case JSONB                   = 'jsonb';
-    case LINE_STRING             = 'lineString';
     case LONG_TEXT               = 'longText';
     case MAC_ADDRESS             = 'macAddress';
     case MEDIUM_INCREMENTS       = 'mediumIncrements';
     case MEDIUM_INTEGER          = 'mediumInteger';
     case MEDIUM_TEXT             = 'mediumText';
-    case MULTI_LINE_STRING       = 'multiLineString';
-    case MULTI_POINT             = 'multiPoint';
-    case MULTI_POLYGON           = 'multiPolygon';
-    case POINT                   = 'point';
-    case POLYGON                 = 'polygon';
     case REMEMBER_TOKEN          = 'rememberToken';
     case SET                     = 'set';
     case SMALL_INCREMENTS        = 'smallIncrements';

src/MigrationsGeneratorServiceProvider.php

@@ -189,13 +189,6 @@ protected function registerColumnTypeGenerator(): void
             [
                 ColumnType::GEOGRAPHY,
                 ColumnType::GEOMETRY,
-                ColumnType::GEOMETRY_COLLECTION,
-                ColumnType::LINE_STRING,
-                ColumnType::MULTI_LINE_STRING,
-                ColumnType::POINT,
-                ColumnType::MULTI_POINT,
-                ColumnType::MULTI_POLYGON,
-                ColumnType::POLYGON,
             ] as $columnType
         ) {
             $this->columnTypeSingleton($columnType, SpatialColumn::class);

tests/resources/database/migrations/general/2020_03_21_000000_expected_create_all_columns_table.php

@@ -80,7 +80,7 @@ public function up()
 
             if (
                 !in_array(DB::getDriverName(), [Driver::MARIADB->value, Driver::MYSQL->value]) ||
-                version_compare(DB::getPdo()->getAttribute(PDO::ATTR_SERVER_VERSION), '5.7', 'eq')
+                version_compare(DB::getPdo()->getAttribute(PDO::ATTR_SERVER_VERSION), '5.8', '>')
             ) {
                 $table->geography('geography');
                 $table->geography('geographyGeometryCollection', 'geometryCollection');