Slot the SingleStore modifiers in in the right spot, not just at the end.

Author: aarondfrancis

src/Schema/Grammar/ModifiesColumns.php

@@ -19,13 +19,24 @@ trait ModifiesColumns
      * @var string[]
      */
     protected $singleStoreModifiers = [
-        'Sparse', 'Option', 'SeriesTimestamp',
+        'SeriesTimestamp', 'Sparse', 'Option',
     ];
 
     protected function addSingleStoreModifiers()
     {
         if (! $this->singleStoreModifiersAdded) {
-            $this->modifiers = array_merge($this->modifiers, $this->singleStoreModifiers);
+            // We need to insert all of our modifiers before the "after" modifier,
+            // otherwise things like "sparse" will come after "after", which is
+            // invalid SQL. So we find the position of the "after" modifier in
+            // the parent, and then slot our modifiers in before it.
+            $index = array_search('After', $this->modifiers);
+
+            $this->modifiers = array_merge(
+                array_slice($this->modifiers, 0, $index),
+                $this->singleStoreModifiers,
+                array_slice($this->modifiers, $index)
+            );
+
             $this->singleStoreModifiersAdded = true;
         }
     }

tests/Hybrid/CreateTable/SparseModifiersTest.php

@@ -5,6 +5,9 @@
 
 namespace SingleStore\Laravel\Tests\Hybrid\CreateTable;
 
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
 use SingleStore\Laravel\Schema\Blueprint;
 use SingleStore\Laravel\Tests\BaseTest;
 use SingleStore\Laravel\Tests\Hybrid\HybridTestHelpers;
@@ -44,4 +47,23 @@ public function sparse_table()
             'create rowstore table `test` (`name` varchar(255) not null) compression = sparse'
         );
     }
+
+    /** @test */
+    public function sparse_with_after()
+    {
+        // See https://github.com/singlestore-labs/singlestoredb-laravel-driver/issues/18
+        $blueprint = new Blueprint('test');
+
+        $blueprint->string('two_factor_secret')
+            ->after('password')
+            ->nullable()
+            ->sparse();
+
+        $statements = $blueprint->toSql($this->getConnection(), $this->getGrammar());
+
+        $this->assertEquals(
+            'alter table `test` add `two_factor_secret` varchar(255) null sparse after `password`',
+            $statements[0]
+        );
+    }
 }