Move sort key desc to argument

Author: miguilimzero

src/Schema/Blueprint/InlinesIndexes.php

@@ -18,7 +18,6 @@ trait InlinesIndexes
     protected $singleStoreIndexes = [
         'shardKey',
         'sortKey',
-        'sortKeyDesc'
     ];
 
     /**

src/Schema/Blueprint/ModifiesIndexes.php

@@ -24,19 +24,12 @@ public function shardKey($columns, $name = null)
      * @param $name
      * @return \Illuminate\Support\Fluent
      */
-    public function sortKey($columns, $name = null)
+    public function sortKey($columns, $name = null, $direction = 'asc')
     {
-        return $this->indexCommand('sortKey', $columns, $name);
-    }
+        $command = $this->indexCommand('sortKey', $columns, $name);
+        $command->direction = $direction;
 
-    /**
-     * @param $columns
-     * @param $name
-     * @return \Illuminate\Support\Fluent
-     */
-    public function sortKeyDesc($columns, $name = null)
-    {
-        return $this->indexCommand('sortKeyDesc', $columns, $name);
+        return $command;
     }
 
     /**

src/Schema/Grammar/CompilesKeys.php

@@ -17,12 +17,7 @@ public function compileShardKey(Blueprint $blueprint, Fluent $command)
 
     public function compileSortKey(Blueprint $blueprint, Fluent $command)
     {
-        return "sort key({$this->columnize($command->columns)})";
-    }
-
-    public function compileSortKeyDesc(Blueprint $blueprint, Fluent $command)
-    {
-        return "sort key({$this->columnize($command->columns)} desc)";
+        return "sort key({$this->columnize($command->columns)} {$command->direction})";
     }
 
     public function compileSpatialIndex(Blueprint $blueprint, Fluent $command)

tests/Hybrid/CreateTable/SortKeysDescTest.php

@@ -23,7 +23,21 @@ public function it_adds_a_sort_key_standalone()
 
         $this->assertCreateStatement(
             $blueprint,
-            'create table `test` (`name` varchar(255) not null, sort key(`name`))'
+            'create table `test` (`name` varchar(255) not null, sort key(`name` asc))'
+        );
+    }
+
+    /** @test */
+    public function it_adds_a_sort_key_desc_standalone()
+    {
+        $blueprint = $this->createTable(function (Blueprint $table) {
+            $table->string('name');
+            $table->sortKey(columns: 'name', direction: 'desc');
+        });
+
+        $this->assertCreateStatement(
+            $blueprint,
+            'create table `test` (`name` varchar(255) not null, sort key(`name` desc))'
         );
     }
 
@@ -36,7 +50,7 @@ public function it_adds_a_sort_key_fluent()
 
         $this->assertCreateStatement(
             $blueprint,
-            'create table `test` (`name` varchar(255) not null, sort key(`name`))'
+            'create table `test` (`name` varchar(255) not null, sort key(`name` asc))'
         );
     }
 
@@ -51,7 +65,7 @@ public function it_adds_a_dual_sort_key()
 
         $this->assertCreateStatement(
             $blueprint,
-            'create table `test` (`f_name` varchar(255) not null, `l_name` varchar(255) not null, sort key(`f_name`, `l_name`))'
+            'create table `test` (`f_name` varchar(255) not null, `l_name` varchar(255) not null, sort key(`f_name`, `l_name` asc))'
         );
     }
 
@@ -64,7 +78,7 @@ public function shard_and_sort_keys()
 
         $this->assertCreateStatement(
             $blueprint,
-            'create table `test` (`name` varchar(255) not null, shard key(`name`), sort key(`name`))'
+            'create table `test` (`name` varchar(255) not null, shard key(`name`), sort key(`name` asc))'
         );
     }
 }