Add command showDatabases(). (#265)

yiisoft · Apr 5, 2023 · 8cc508c · 8cc508c
1 parent 9114f6b
commit 8cc508c
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 9 deletions.
diff --git a/src/CommandPDO.php b/src/CommandPDO.php
@@ -17,6 +17,15 @@
  */
 final class CommandPDO extends AbstractCommandPDO
 {
+    public function showDatabases(): array
+    {
+        $sql = <<<SQL
+        SELECT datname FROM pg_database WHERE datistemplate = false AND datname NOT IN ('postgres', 'template0', 'template1')
+        SQL;
+
+        return $this->setSql($sql)->queryColumn();
+    }
+
     protected function getQueryBuilder(): QueryBuilderInterface
     {
         return $this->db->getQueryBuilder();

diff --git a/src/Dsn.php b/src/Dsn.php
@@ -19,10 +19,14 @@ final class Dsn extends AbstractDsn
     public function __construct(
         string $driver,
         string $host,
-        string $databaseName,
+        string|null $databaseName = 'postgres',
         string $port = '5432',
         array $options = []
     ) {
+        if (empty($databaseName)) {
+            $databaseName = 'postgres';
+        }
+
         parent::__construct($driver, $host, $databaseName, $port, $options);
     }
 }
diff --git a/tests/CommandTest.php b/tests/CommandTest.php
@@ -9,8 +9,12 @@
 use Yiisoft\Db\Exception\InvalidConfigException;
 use Yiisoft\Db\Exception\NotSupportedException;
 use Yiisoft\Db\Expression\JsonExpression;
+use Yiisoft\Db\Pgsql\ConnectionPDO;
+use Yiisoft\Db\Pgsql\Dsn;
+use Yiisoft\Db\Pgsql\PDODriver;
 use Yiisoft\Db\Pgsql\Tests\Support\TestTrait;
 use Yiisoft\Db\Tests\Common\CommonCommandTest;
+use Yiisoft\Db\Tests\Support\DbHelper;
 
 use function serialize;
 
@@ -315,4 +319,15 @@ public function testinsertWithReturningPksUuid(): void
 
         $db->close();
     }
+
+    public function testShowDatabases(): void
+    {
+        $dsn = new Dsn('pgsql', '127.0.0.1');
+        $db = new ConnectionPDO(new PDODriver($dsn->asString(), 'root', 'root'), DbHelper::getSchemaCache());
+
+        $command = $db->createCommand();
+
+        $this->assertSame('pgsql:host=127.0.0.1;dbname=postgres;port=5432', $db->getDriver()->getDsn());
+        $this->assertSame(['yiitest'], $command->showDatabases());
+    }
 }
diff --git a/tests/DsnTest.php b/tests/DsnTest.php
@@ -22,6 +22,30 @@ public function testAsString(): void
         );
     }
 
+    public function testAsStringWithDatabaseName(): void
+    {
+        $this->assertSame(
+            'pgsql:host=localhost;dbname=postgres;port=5432',
+            (new Dsn('pgsql', 'localhost'))->asString(),
+        );
+    }
+
+    public function testAsStringWithDatabaseNameWithEmptyString(): void
+    {
+        $this->assertSame(
+            'pgsql:host=localhost;dbname=postgres;port=5432',
+            (new Dsn('pgsql', 'localhost', ''))->asString(),
+        );
+    }
+
+    public function testAsStringWithDatabaseNameWithNull(): void
+    {
+        $this->assertSame(
+            'pgsql:host=localhost;dbname=postgres;port=5432',
+            (new Dsn('pgsql', 'localhost', null))->asString(),
+        );
+    }
+
     public function testAsStringWithOptions(): void
     {
         $this->assertSame(

diff --git a/tests/Support/TestTrait.php b/tests/Support/TestTrait.php
@@ -25,10 +25,7 @@ protected function getConnection(bool $fixture = false): ConnectionPDOInterface
     {
         $pdoDriver = new PDODriver($this->getDsn(), 'root', 'root');
         $pdoDriver->charset('utf8');
-        $db = new ConnectionPDO(
-            $pdoDriver,
-            DbHelper::getSchemaCache(),
-        );
+        $db = new ConnectionPDO($pdoDriver, DbHelper::getSchemaCache());
 
         if ($fixture) {
             DbHelper::loadFixture($db, __DIR__ . "/Fixture/$this->fixture");
@@ -41,10 +38,7 @@ protected static function getDb(): ConnectionPDOInterface
     {
         $dsn = (new Dsn('pgsql', '127.0.0.1', 'yiitest', '5432'))->asString();
 
-        return new ConnectionPDO(
-            new PDODriver($dsn, 'root', 'root'),
-            DbHelper::getSchemaCache(),
-        );
+        return new ConnectionPDO(new PDODriver($dsn, 'root', 'root'), DbHelper::getSchemaCache());
     }
 
     protected function getDsn(): string