Fixes for Laravel 5.2+/MySQL 8:

- Added Srid to MySqlGrammar
- Added explicit charset and collation to migrations in tests
- Fixed show create command in tests for MySQL 8
- Changed branch alias to 3.0

Author: grimzy

composer.json

@@ -43,7 +43,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.0.x-dev"
+            "dev-master": "3.0.x-dev"
         },
         "laravel": {
             "providers": [

src/Schema/Grammars/MySqlGrammar.php

@@ -8,10 +8,25 @@
 
 class MySqlGrammar extends IlluminateMySqlGrammar
 {
+    /**
+     * The possible column modifiers.
+     *
+     * @var array
+     */
+//    protected $modifiers = [
+//        'Unsigned', 'Charset', 'Collate', 'VirtualAs', 'StoredAs', 'Nullable',
+//        'Default', 'Increment', 'Comment', 'After', 'First', 'Srid',
+//    ];
+
+    public function __construct()
+    {
+        $this->modifiers[] = 'Srid';
+    }
+
     /**
      * Adds a statement to add a geometry column.
      *
-     * @param \Illuminate\Support\Fluent $column
+     * @param Fluent $column
      *
      * @return string
      */
@@ -23,7 +38,7 @@ public function typeGeometry(Fluent $column)
     /**
      * Adds a statement to add a point column.
      *
-     * @param \Illuminate\Support\Fluent $column
+     * @param Fluent $column
      *
      * @return string
      */
@@ -35,7 +50,7 @@ public function typePoint(Fluent $column)
     /**
      * Adds a statement to add a linestring column.
      *
-     * @param \Illuminate\Support\Fluent $column
+     * @param Fluent $column
      *
      * @return string
      */
@@ -47,7 +62,7 @@ public function typeLinestring(Fluent $column)
     /**
      * Adds a statement to add a polygon column.
      *
-     * @param \Illuminate\Support\Fluent $column
+     * @param Fluent $column
      *
      * @return string
      */
@@ -59,7 +74,7 @@ public function typePolygon(Fluent $column)
     /**
      * Adds a statement to add a multipoint column.
      *
-     * @param \Illuminate\Support\Fluent $column
+     * @param Fluent $column
      *
      * @return string
      */
@@ -71,7 +86,7 @@ public function typeMultipoint(Fluent $column)
     /**
      * Adds a statement to add a multilinestring column.
      *
-     * @param \Illuminate\Support\Fluent $column
+     * @param Fluent $column
      *
      * @return string
      */
@@ -83,7 +98,7 @@ public function typeMultilinestring(Fluent $column)
     /**
      * Adds a statement to add a multipolygon column.
      *
-     * @param \Illuminate\Support\Fluent $column
+     * @param Fluent $column
      *
      * @return string
      */
@@ -95,7 +110,7 @@ public function typeMultipolygon(Fluent $column)
     /**
      * Adds a statement to add a geometrycollection column.
      *
-     * @param \Illuminate\Support\Fluent $column
+     * @param Fluent $column
      *
      * @return string
      */
@@ -107,13 +122,28 @@ public function typeGeometrycollection(Fluent $column)
     /**
      * Compile a spatial index key command.
      *
-     * @param \Grimzy\LaravelMysqlSpatial\Schema\Blueprint $blueprint
-     * @param \Illuminate\Support\Fluent                   $command
+     * @param Blueprint $blueprint
+     * @param Fluent    $command
      *
      * @return string
      */
     public function compileSpatial(Blueprint $blueprint, Fluent $command)
     {
         return $this->compileKey($blueprint, $command, 'spatial');
     }
+
+    /**
+     * Get the SQL for a SRID column modifier.
+     *
+     * @param  Blueprint  $blueprint
+     * @param  Fluent     $column
+     *
+     * @return string|null
+     */
+    protected function modifySrid(Blueprint $blueprint, Fluent $column)
+    {
+        if (!is_null($column->srid) && is_int($column->srid) && $column->srid > 0) {
+            return ' srid '.$column->srid;
+        }
+    }
 }

tests/Integration/MigrationTest.php

@@ -14,7 +14,7 @@ public function testTableWasCreatedWithRightTypes()
         $result = DB::selectOne('SHOW CREATE TABLE geometry');
 
         $expected = 'CREATE TABLE `geometry` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
   `geo` geometry DEFAULT NULL,
   `location` point NOT NULL,
   `line` linestring DEFAULT NULL,
@@ -38,7 +38,7 @@ public function testTableWasCreatedWithSrid()
         $result = DB::selectOne('SHOW CREATE TABLE with_srid');
 
         $expected = 'CREATE TABLE `with_srid` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
   `geo` geometry /*!80003 SRID 3857 */ DEFAULT NULL,
   `location` point /*!80003 SRID 3857 */ DEFAULT NULL,
   `line` linestring /*!80003 SRID 3857 */ DEFAULT NULL,

tests/Integration/Migrations/CreateTables.php

@@ -14,6 +14,8 @@ class CreateLocationTable extends Migration
     public function up()
     {
         Schema::create('geometry', function (Blueprint $table) {
+            $table->charset = 'utf8mb4';
+            $table->collation = 'utf8mb4_unicode_ci';
             $table->increments('id');
             $table->geometry('geo')->default(null)->nullable();
             $table->point('location');  // required to be not null in order to add an index
@@ -32,6 +34,8 @@ public function up()
         });
 
         Schema::create('with_srid', function (Blueprint $table) {
+            $table->charset = 'utf8mb4';
+            $table->collation = 'utf8mb4_unicode_ci';
             $table->increments('id');
             $table->geometry('geo', 3857)->default(null)->nullable();
             $table->point('location', 3857)->default(null)->nullable();