Merge pull request #7972 from kenjis/feat-spark-db-table-show-db-config

feat: db:table shows db config
codeigniter4 · Oct 12, 2023 · bfeb6c5 · bfeb6c5
2 parents a8f589d + 3680360
commit bfeb6c5
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 0 deletions.
diff --git a/system/Commands/Database/ShowTableInfo.php b/system/Commands/Database/ShowTableInfo.php
@@ -102,6 +102,8 @@ public function run(array $params)
         $this->db       = Database::connect();
         $this->DBPrefix = $this->db->getPrefix();
 
+        $this->showDBConfig();
+
         $tables = $this->db->listTables();
 
         if (array_key_exists('desc', $params)) {
@@ -145,6 +147,22 @@ public function run(array $params)
         $this->showDataOfTable($tableName, $limitRows, $limitFieldValue);
     }
 
+    private function showDBConfig(): void
+    {
+        $data = [[
+            'hostname' => $this->db->hostname,
+            'database' => $this->db->getDatabase(),
+            'username' => $this->db->username,
+            'DBDriver' => $this->db->getPlatform(),
+            'DBPrefix' => $this->DBPrefix,
+            'port'     => $this->db->port,
+        ]];
+        CLI::table(
+            $data,
+            ['hostname', 'database', 'username', 'DBDriver', 'DBPrefix', 'port']
+        );
+    }
+
     private function removeDBPrefix(): void
     {
         $this->db->setPrefix('');

diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
@@ -45,6 +45,7 @@
  * @property int        $transDepth
  * @property bool       $transFailure
  * @property bool       $transStatus
+ * @property string     $username
  *
  * @template TConnection
  * @template TResult

diff --git a/tests/system/Commands/Database/ShowTableInfoTest.php b/tests/system/Commands/Database/ShowTableInfoTest.php
@@ -64,6 +64,16 @@ public function testDbTable(): void
         $this->assertMatchesRegularExpression($expectedPattern, $result);
     }
 
+    public function testDbTableShowsDBConfig(): void
+    {
+        command('db:table');
+
+        $result = $this->getNormalizedResult();
+
+        $expectedPattern = '/\| hostname[[:blank:]]+\| database[[:blank:]]+\| username[[:blank:]]+\| DBDriver[[:blank:]]+\| DBPrefix[[:blank:]]+\| port[[:blank:]]+\|/';
+        $this->assertMatchesRegularExpression($expectedPattern, $result);
+    }
+
     public function testDbTableShow(): void
     {
         command('db:table --show');