Added support of the Laravel 10

Summary:
Changed the inlining of the indexes.
The previous implementation assumed that the number of commands equals the number of generated statements but this is not always true.

Author: AdalbertMemSQL

.devcontainer/devcontainer.json

@@ -8,7 +8,7 @@
       // Update VARIANT to pick a PHP version: 8, 8.1, 8.0, 7, 7.4
       // Append -bullseye or -buster to pin to an OS version.
       // Use -bullseye variants on local on arm64/Apple Silicon.
-      "VARIANT": "8"
+      "VARIANT": "8.1"
     }
   },
 

.github/workflows/tests.yml

@@ -19,7 +19,7 @@ jobs:
       fail-fast: false
       matrix:
         php: [7.3, 7.4, 8.0, 8.1]
-        laravel: [8.*, 9.*]
+        laravel: [8.*, 9.*, 10.*]
         dependency-version: [prefer-lowest, prefer-stable]
         include:
           - laravel: 8.*
@@ -28,6 +28,9 @@ jobs:
           - laravel: 9.*
             testbench: 7.*
 
+          - laravel: 10.*
+            testbench: 8.*
+
         exclude:
           # Laravel 8.0 has type incompatibilities with PHP 8.1.
           - laravel: 8.*
@@ -41,6 +44,16 @@ jobs:
           - laravel: 9.*
             php: 7.4
 
+          # Laravel 10 requires PHP 8.1
+          - laravel: 10.*
+            php: 7.3
+
+          - laravel: 10.*
+            php: 7.4
+
+          - laravel: 10.*
+            php: 8.0
+
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
 
     services:

composer.json

@@ -25,10 +25,10 @@
   ],
   "require": {
     "php": "^7.3|^8.0",
-    "illuminate/container": "^8.0|^9.0",
-    "illuminate/database": "^8.0|^9.0",
-    "illuminate/events": "^8.0|^9.0",
-    "illuminate/support": "^8.0|^9.0"
+    "illuminate/container": "^8.0|^9.0|^10.0",
+    "illuminate/database": "^8.0|^9.0|^10.0",
+    "illuminate/events": "^8.0|^9.0|^10.0",
+    "illuminate/support": "^8.0|^9.0|^10.0"
   },
   "require-dev": {
     "mockery/mockery": "^1.5",

src/Schema/Blueprint.php

@@ -27,13 +27,6 @@ public function geographyPoint($column)
         return $this->point($column);
     }
 
-    public function toSql(Connection $connection, Grammar $grammar)
-    {
-        $statements = parent::toSql($connection, $grammar);
-
-        return $this->creating() ? $this->inlineCreateIndexStatements($statements) : $statements;
-    }
-
     /**
      * Execute the blueprint against the database.
      *

src/Schema/Blueprint/InlinesIndexes.php

@@ -2,7 +2,9 @@
 
 namespace SingleStore\Laravel\Schema\Blueprint;
 
+use Illuminate\Database\Connection;
 use Illuminate\Database\Schema\Grammars\Grammar;
+use Illuminate\Foundation\Application;
 use Illuminate\Support\Arr;
 use SingleStore\Laravel\Schema\Blueprint as SingleStoreBlueprint;
 
@@ -32,34 +34,27 @@ trait InlinesIndexes
         'spatialIndex',
     ];
 
-    /**
-     * The keys of the commands that are indexes
-     *
-     * @var int[]
-     */
-    protected $indexCommandKeys = [];
-
     /**
      * Given a set of statements from the `toSQL` method, inline all
      * of the indexes into the CREATE TABLE statement.
      *
      * @param  array  $statements
      * @return array
      */
-    protected function inlineCreateIndexStatements($statements)
+    protected function inlineCreateIndexStatements($statements, $indexStatementKeys)
     {
         // In the `addImpliedCommands` method we gathered up the keys of all the commands
         // that are index commands. Now that we're ready to compile the SQL we'll pull
         // all those statements out to sneak them into the CREATE TABLE statement.
-        $indexStatements = Arr::only($statements, $this->indexCommandKeys);
+        $indexStatements = Arr::only($statements, $indexStatementKeys);
 
         // Since we're putting the index statements inside the CREATE TABLE statement,
         // we pull them out of the statement list so that they don't run as ALTERs.
-        Arr::forget($statements, $this->indexCommandKeys);
+        Arr::forget($statements, $indexStatementKeys);
 
         $search = SingleStoreBlueprint::INDEX_PLACEHOLDER;
 
-        if (! $indexStatements) {
+        if (!$indexStatements) {
             // If there are no index statements at all, we need to replace the preceding comma as well.
             $search = ", $search";
         }
@@ -72,37 +67,18 @@ protected function inlineCreateIndexStatements($statements)
     }
 
     /**
-     * Get all of the index commands out of the blueprint's command queue.
+     * Check if the command is index.
      *
      * @return \Illuminate\Support\Collection
      */
-    protected function indexCommands()
+    protected function isIndexCommand($command)
     {
-        return $this->commandsNamed(array_merge(
+        return in_array($command->name, array_merge(
             $this->singleStoreIndexes,
             $this->mysqlIndexes
         ));
     }
 
-    /**
-     * @param  Grammar  $grammar
-     * @return void
-     */
-    protected function addImpliedCommands(Grammar $grammar)
-    {
-        parent::addImpliedCommands($grammar);
-
-        $this->addFluentSingleStoreIndexes();
-
-        if ($this->creating()) {
-            // We have to pull the keys for the indexes during this method because once
-            // compiled, the primary key's `name` attribute is set to null, meaning
-            // that we can no longer tell what type of key it is. By hooking into
-            // the `addImpliedCommands` method, we access it before compilation.
-            $this->indexCommandKeys = $this->indexCommands()->keys()->toArray();
-        }
-    }
-
     /**
      * @return void
      */
@@ -132,4 +108,33 @@ protected function addFluentSingleStoreIndexes()
             }
         }
     }
+
+    public function toSql(Connection $connection, Grammar $grammar)
+    {
+        if (version_compare(Application::VERSION, '10.0.0', '>=')) {
+            $this->addImpliedCommands($connection, $grammar);
+        } else {
+            $this->addImpliedCommands($grammar);
+        }
+        $this->addFluentSingleStoreIndexes();
+
+        $statements = [];
+        $indexStatementKeys = [];
+
+        foreach ($this->commands as $command) {
+            $method = 'compile' . ucfirst($command->name);
+            $isIndex = $this->isIndexCommand($command);
+
+            if (method_exists($grammar, $method) || $grammar::hasMacro($method)) {
+                if (!is_null($sql = $grammar->$method($this, $command, $connection))) {
+                    $statements = array_merge($statements, (array) $sql);
+                    if ($isIndex) {
+                        array_push($indexStatementKeys, count($statements) - 1);
+                    }
+                }
+            }
+        }
+
+        return $this->creating() ? $this->inlineCreateIndexStatements($statements, $indexStatementKeys) : $statements;
+    }
 }