Merge pull request #28 from srdante/sort-key-improvement

Sort key direction support improvement

Author: Carl Sverre

src/Schema/Grammar.php

@@ -177,6 +177,21 @@ protected function compileKey(Blueprint $blueprint, Fluent $command, $type)
         return str_replace(sprintf('alter table %s add ', $this->wrapTable($blueprint)), '', $compiled);
     }
 
+    /**
+     * 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)
+    {
+        $wrapped = array_map([$this, 'wrap'], $columns);
+
+        return implode(", ", array_map(function ($column) use ($direction) {
+            return $column . ' ' . $direction;
+        }, $wrapped));
+     }
+     
     /**
      * Get the SQL for an auto-increment column modifier.
      *

src/Schema/Grammar/CompilesKeys.php

@@ -22,10 +22,10 @@ public function compileSortKey(Blueprint $blueprint, Fluent $command)
                 return "{$variable}={$value}";
             })->join(',');
 
-            return "sort key({$this->columnize($command->columns)} {$command->direction}) with ({$compiled})";
+            return "sort key({$this->columnizeWithDirection($command->columns, $command->direction)}) with ({$compiled})";
         }
 
-        return "sort key({$this->columnize($command->columns)} {$command->direction})";
+        return "sort key({$this->columnizeWithDirection($command->columns, $command->direction)})";
     }
 
     public function compileSpatialIndex(Blueprint $blueprint, Fluent $command)

tests/Hybrid/CreateTable/SortKeysTest.php

@@ -78,7 +78,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` asc))'
+            'create table `test` (`f_name` varchar(255) not null, `l_name` varchar(255) not null, sort key(`f_name` asc, `l_name` asc))'
         );
     }