Merge pull request #20 from singlestore-labs/af-fix-sparse

Fix sparse modifier positioning

Author: aarondfrancis

src/Schema/Grammar.php

@@ -19,6 +19,13 @@ class Grammar extends MySqlGrammar
 {
     use CompilesKeys, ModifiesColumns;
 
+    public function __construct()
+    {
+        // Before anything kicks off, we need to add the SingleStore modifiers
+        // so that they'll get used while the columns are all compiling.
+        $this->addSingleStoreModifiers();
+    }
+
     /**
      * Create the column definition for a spatial Geography type.
      *
@@ -54,10 +61,6 @@ public function typePoint(Fluent $column)
      */
     protected function compileCreateTable($blueprint, $command, $connection)
     {
-        // Before anything kicks off, we need to add the SingleStore modifiers
-        // so that they'll get used while the columns are all compiling.
-        $this->addSingleStoreModifiers();
-
         // We want to do as little as possible ourselves, so we rely on the parent
         // to compile everything and then potentially sneak some modifiers in.
         return $this->insertCreateTableModifiers(

src/Schema/Grammar/ModifiesColumns.php

@@ -19,13 +19,24 @@ trait ModifiesColumns
      * @var string[]
      */
     protected $singleStoreModifiers = [
-        'Sparse', 'Option', 'SeriesTimestamp',
+        'Sparse', 'SeriesTimestamp', '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

@@ -44,4 +44,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]
+        );
+    }
 }

tests/Hybrid/Json/JsonWhereTest.php

@@ -111,7 +111,7 @@ public function where_null()
         $query = DB::table('test')->whereNull('data->value1');
 
         $this->assertEquals(
-        // @TODO check docs
+            // @TODO check docs
             "select * from `test` where (JSON_EXTRACT_JSON(data, 'value1') is null OR json_type(JSON_EXTRACT_JSON(data, 'value1')) = 'NULL')",
             $query->toSql()
         );
@@ -123,7 +123,7 @@ public function where_not_null()
         $query = DB::table('test')->whereNotNull('data->value1');
 
         $this->assertEquals(
-        // @TODO check docs
+            // @TODO check docs
             "select * from `test` where (JSON_EXTRACT_JSON(data, 'value1') is not null AND json_type(JSON_EXTRACT_JSON(data, 'value1')) != 'NULL')",
             $query->toSql()
         );