fix: --desc handling

But tables having the column `id` can be sorted properly.

Author: kenjis

system/Commands/Database/ShowTableInfo.php

@@ -162,7 +162,13 @@ private function showDataOfTable(string $tableName, int $limitRows, int $limitFi
         $thead = $this->db->getFieldNames($tableName);
         $this->restoreDBPrefix();
 
-        $this->tbody = $this->makeTableRows($tableName, $limitRows, $limitFieldValue);
+        // If there is a field named `id`, sort by it.
+        $sortField = null;
+        if (in_array('id', $thead, true)) {
+            $sortField = 'id';
+        }
+
+        $this->tbody = $this->makeTableRows($tableName, $limitRows, $limitFieldValue, $sortField);
         CLI::table($this->tbody, $thead);
     }
 
@@ -203,13 +209,21 @@ private function makeTbodyForShowAllTables(array $tables): array
         return $this->tbody;
     }
 
-    private function makeTableRows(string $tableName, int $limitRows, int $limitFieldValue): array
-    {
+    private function makeTableRows(
+        string $tableName,
+        int $limitRows,
+        int $limitFieldValue,
+        ?string $sortField = null
+    ): array {
         $this->tbody = [];
 
         $this->removeDBPrefix();
         $builder = $this->db->table($tableName);
-        $rows    = $builder->limit($limitRows)->get()->getResultArray();
+        $builder->limit($limitRows);
+        if ($sortField !== null) {
+            $builder->orderBy($sortField, $this->sortDesc ? 'DESC' : 'ASC');
+        }
+        $rows = $builder->get()->getResultArray();
         $this->restoreDBPrefix();
 
         foreach ($rows as $row) {
@@ -222,7 +236,7 @@ private function makeTableRows(string $tableName, int $limitRows, int $limitFiel
             $this->tbody[] = $row;
         }
 
-        if ($this->sortDesc) {
+        if ($sortField === null && $this->sortDesc) {
             krsort($this->tbody);
         }
 

tests/system/Commands/Database/ShowTableInfoTest.php

@@ -169,4 +169,24 @@ public function testDbTableLimitRows(): void
             EOL;
         $this->assertStringContainsString($expected, $result);
     }
+
+    public function testDbTableAllOptions(): void
+    {
+        command('db:table db_user --limit-rows 2 --limit-field-value 5 --desc');
+
+        $result = $this->getResultWithoutControlCode();
+
+        $expected = 'Data of Table "db_user":';
+        $this->assertStringContainsString($expected, $result);
+
+        $expected = <<<'EOL'
+            +----+----------+----------+---------+------------+------------+------------+
+            | id | name     | email    | country | created_at | updated_at | deleted_at |
+            +----+----------+----------+---------+------------+------------+------------+
+            | 4  | Chris... | chris... | UK      |            |            |            |
+            | 3  | Richa... | richa... | US      |            |            |            |
+            +----+----------+----------+---------+------------+------------+------------+
+            EOL;
+        $this->assertStringContainsString($expected, $result);
+    }
 }