Merge pull request #57 from AdalbertMemSQL/issue54

Added support of the Laravel 10

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/Query/Grammar.php

@@ -10,7 +10,6 @@ class Grammar extends MySqlGrammar
     /**
      * Compile a "where fulltext" clause.
      *
-     * @param  \Illuminate\Database\Query\Builder  $query
      * @param  array  $where
      * @return string
      */
@@ -24,8 +23,6 @@ public function whereFullText(Builder $query, $where)
     }
 
     /**
-     * @param $column
-     * @param $value
      * @return string
      */
     protected function compileJsonContains($column, $value)
@@ -153,7 +150,6 @@ protected function wrapUnion($sql)
     /**
      * Compile the "union" queries attached to the main query.
      *
-     * @param  Builder  $query
      * @return string
      */
     protected function compileUnions(Builder $query)
@@ -170,7 +166,6 @@ protected function compileUnions(Builder $query)
     /**
      * Compile a select query into SQL.
      *
-     * @param  Builder  $query
      * @return string
      */
     public function compileSelect(Builder $query)
@@ -199,8 +194,6 @@ public function compileSelect(Builder $query)
     /**
      * Compile the "offset" portions of the query.
      *
-     * @param  Builder  $query
-     * @param    $offset
      * @return string
      */
     protected function compileOffset(Builder $query, $offset)
@@ -210,10 +203,6 @@ protected function compileOffset(Builder $query, $offset)
 
     /**
      * Compile the "offset" portions of the final union query.
-     *
-     * @param  Builder  $query
-     * @param $offset
-     * @return string
      */
     protected function compileUnionOffset(Builder $query, $offset): string
     {
@@ -222,10 +211,6 @@ protected function compileUnionOffset(Builder $query, $offset): string
 
     /**
      * Compile the "offset" portions of the query taking into account "limit" portion.
-     *
-     * @param $offset
-     * @param $limit
-     * @return string
      */
     private function compileOffsetWithLimit($offset, $limit): string
     {

src/Schema/Blueprint.php

@@ -27,18 +27,9 @@ 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.
      *
-     * @param  \Illuminate\Database\Connection  $connection
-     * @param  \Illuminate\Database\Schema\Grammars\Grammar  $grammar
      * @return void
      */
     public function build(Connection $connection, Grammar $grammar)

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,30 +34,23 @@ 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;
 
@@ -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;
+    }
 }

src/Schema/Blueprint/ModifiesIndexes.php

@@ -7,7 +7,6 @@
 trait ModifiesIndexes
 {
     /**
-     * @param $columns
      * @return \Illuminate\Support\Fluent
      */
     public function shardKey($columns)
@@ -16,8 +15,6 @@ public function shardKey($columns)
     }
 
     /**
-     * @param $columns
-     * @param $direction
      * @return \Illuminate\Support\Fluent
      */
     public function sortKey($columns = null, $direction = 'asc')
@@ -29,8 +26,6 @@ public function sortKey($columns = null, $direction = 'asc')
     }
 
     /**
-     * @param $columns
-     * @param $name
      * @return SpatialIndexCommand
      */
     public function spatialIndex($columns, $name = null)

src/Schema/Builder.php

@@ -9,7 +9,6 @@ class Builder extends MySqlBuilder
 {
     /**
      * @param  string  $table
-     * @param  Closure|null  $callback
      * @return \Illuminate\Database\Schema\Blueprint
      */
     protected function createBlueprint($table, Closure $callback = null)

src/Schema/Grammar.php

@@ -28,8 +28,6 @@ public function __construct()
     /**
      * Compile a primary key command.
      *
-     * @param  \Illuminate\Database\Schema\Blueprint  $blueprint
-     * @param  \Illuminate\Support\Fluent  $command
      * @return string
      */
     public function compilePrimary(Blueprint $blueprint, Fluent $command)
@@ -42,7 +40,6 @@ public function compilePrimary(Blueprint $blueprint, Fluent $command)
     /**
      * Create the column definition for a spatial Geography type.
      *
-     * @param  \Illuminate\Support\Fluent  $column
      * @return string
      */
     public function typeGeography(Fluent $column)
@@ -53,7 +50,6 @@ public function typeGeography(Fluent $column)
     /**
      * Create the column definition for a spatial Point type.
      *
-     * @param  \Illuminate\Support\Fluent  $column
      * @return string
      */
     public function typePoint(Fluent $column)
@@ -83,7 +79,6 @@ protected function compileCreateTable($blueprint, $command, $connection)
     }
 
     /**
-     * @param  Fluent  $column
      * @return string
      */
     protected function getType(Fluent $column)
@@ -105,8 +100,6 @@ protected function getType(Fluent $column)
      * Append the engine specifications to a command.
      *
      * @param  string  $sql
-     * @param  \Illuminate\Database\Connection  $connection
-     * @param  \Illuminate\Database\Schema\Blueprint  $blueprint
      * @return string
      */
     protected function compileCreateEngine($sql, Connection $connection, Blueprint $blueprint)
@@ -123,8 +116,6 @@ protected function compileCreateEngine($sql, Connection $connection, Blueprint $
     }
 
     /**
-     * @param $blueprint
-     * @param $compiled
      * @return string
      *
      * @throws Exception
@@ -149,7 +140,6 @@ protected function insertCreateTableModifiers($blueprint, $compiled)
     }
 
     /**
-     * @param  Blueprint  $blueprint
      * @return array
      *
      * @throws Exception
@@ -169,9 +159,6 @@ protected function getColumns(Blueprint $blueprint)
     }
 
     /**
-     * @param  Blueprint  $blueprint
-     * @param  Fluent  $command
-     * @param $type
      * @return array|string|string[]
      */
     protected function compileKey(Blueprint $blueprint, Fluent $command, $type)
@@ -192,7 +179,6 @@ protected function compileKey(Blueprint $blueprint, Fluent $command, $type)
     /**
      * Convert an array of column names into a delimited string (with direction parameter).
      *
-     * @param  array  $columns
      * @return string
      */
     protected function columnizeWithDirection(array $columns, string $direction)
@@ -225,8 +211,6 @@ protected function columnizeWithDirection(array $columns, string $direction)
     /**
      * Get the SQL for an auto-increment column modifier.
      *
-     * @param  \Illuminate\Database\Schema\Blueprint  $blueprint
-     * @param  \Illuminate\Support\Fluent  $column
      * @return string|null
      */
     protected function modifyIncrement(Blueprint $blueprint, Fluent $column)
@@ -241,8 +225,6 @@ protected function modifyIncrement(Blueprint $blueprint, Fluent $column)
     /**
      * Compile a rename table command.
      *
-     * @param  \Illuminate\Database\Schema\Blueprint  $blueprint
-     * @param  \Illuminate\Support\Fluent  $command
      * @return string
      */
     public function compileRename(Blueprint $blueprint, Fluent $command)