Fix dbname key.

spacetab-io · May 5, 2020 · 3637ad6 · 3637ad6
1 parent 09832df
commit 3637ad6
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -60,9 +60,9 @@ $config = new Reader([
     ]
 ]);
 
-$config->addPacker('pgsql', new KeyValue\Amp\Postgres());
+$config->addPacker('pgsql', new KeyValue\Postgres());
 $config->getConnectionString($connectionName = 'default'); 
-# host=127.0.0.1,127.0.0.2 port=5432,6432 user=roquie password=secret db=roquie schema=roquie connect_timeout=10 target_session_attrs=any sslmode=require
+# host=127.0.0.1,127.0.0.2 port=5432,6432 user=roquie password=secret dbname=roquie schema=roquie connect_timeout=10 target_session_attrs=any sslmode=require
 ```
 
 Note: Amphp connection string to mysql and postgres clients does not support multiple hosts connection (05-05-2020).

diff --git a/src/Packer/KeyValue/Amp/Postgres.php → src/Packer/KeyValue/Postgres.php b/src/Packer/KeyValue/Amp/Postgres.php → src/Packer/KeyValue/Postgres.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Spacetab\DbConfig\Packer\KeyValue\Amp;
+namespace Spacetab\DbConfig\Packer\KeyValue;
 
 use Spacetab\DbConfig\Packer\AbstractPacker;
 
@@ -18,7 +18,7 @@ final class Postgres extends AbstractPacker
     public function __invoke(string $connectionName, ?array $config = null): string
     {
         if (is_null($config)) {
-            return 'host=127.0.0.1 port=5432 user=postgres db=postgres';
+            return 'host=127.0.0.1 port=5432 user=postgres dbname=postgres';
         }
 
         $name    = isset($config['name'])    ? $this->validateName($connectionName, $config)    : 'postgres';
@@ -30,10 +30,10 @@ public function __invoke(string $connectionName, ?array $config = null): string
         $options = isset($config['options']) ? $this->validateOptions($connectionName, $config) : [];
 
         $chunks = [
-            'host=' . join(',', $hosts),
-            'port=' . join(',', $ports),
-            'user=' . $user,
-            'db='   . $name
+            'host='   . join(',', $hosts),
+            'port='   . join(',', $ports),
+            'user='   . $user,
+            'dbname=' . $name
         ];
 
         if (!is_null($pass)) {

diff --git a/tests/Packer/KeyValue/Amp/PostgresTest.php → tests/Packer/KeyValue/PostgresTest.php b/tests/Packer/KeyValue/Amp/PostgresTest.php → tests/Packer/KeyValue/PostgresTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Spacetab\Tests\DbConfig\Packer\KeyValue\Amp;
+namespace Spacetab\Tests\DbConfig\Packer\KeyValue;
 
 use PHPUnit\Framework\TestCase;
 use Spacetab\DbConfig\Packer\KeyValue;
@@ -11,10 +11,10 @@ class PostgresTest extends TestCase
 {
     public function testPackerReturnsDefaultConnStringIfConfigIsNull()
     {
-        $packer = new KeyValue\Amp\Postgres();
+        $packer = new KeyValue\Postgres();
         $string = $packer('default', null);
 
-        $this->assertSame('host=127.0.0.1 port=5432 user=postgres db=postgres', $string);
+        $this->assertSame('host=127.0.0.1 port=5432 user=postgres dbname=postgres', $string);
     }
 
     public function invalidValuesProvider()
@@ -39,7 +39,7 @@ public function invalidValuesProvider()
      */
     public function testPackerThrowsAnExceptionIfProvidedInvalidValues(array $values)
     {
-        $packer = new KeyValue\Amp\Postgres();
+        $packer = new KeyValue\Postgres();
 
         $this->expectException(\InvalidArgumentException::class);
 
@@ -48,7 +48,7 @@ public function testPackerThrowsAnExceptionIfProvidedInvalidValues(array $values
 
     public function testMultiServerConfiguration()
     {
-        $packer = new KeyValue\Amp\Postgres();
+        $packer = new KeyValue\Postgres();
         $string = $packer('default', [
             'host' => ['127.0.0.1', '127.0.0.2'],
             'port' => [5432, 6432],
@@ -61,7 +61,7 @@ public function testMultiServerConfiguration()
             ],
         ]);
 
-        $valid = 'host=127.0.0.1,127.0.0.2 port=5432,6432 user=roquie db=postgres password=secret schema=postgres sslmode=require connect_timeout=10';
+        $valid = 'host=127.0.0.1,127.0.0.2 port=5432,6432 user=roquie dbname=postgres password=secret schema=postgres sslmode=require connect_timeout=10';
         $this->assertSame($valid, $string);
     }
 }
diff --git a/tests/ReaderTest.php b/tests/ReaderTest.php
@@ -41,9 +41,9 @@ public function testUnusedConnectionName()
     public function testWhereItReturnsConnectionStringIfPackerExistsButOptionsNot()
     {
         $reader = new Reader();
-        $reader->addPacker('pgsql', new KeyValue\Amp\Postgres());
+        $reader->addPacker('pgsql', new KeyValue\Postgres());
 
-        $this->assertSame('host=127.0.0.1 port=5432 user=postgres db=postgres', $reader->getConnectionString());
+        $this->assertSame('host=127.0.0.1 port=5432 user=postgres dbname=postgres', $reader->getConnectionString());
     }
 
     public function testWhereItReturnsConnectionStringIfPackerExistsWithOptions()
@@ -53,8 +53,8 @@ public function testWhereItReturnsConnectionStringIfPackerExistsWithOptions()
                 'type' => 'pgsql',
             ]
         ]);
-        $reader->addPacker('pgsql', new KeyValue\Amp\Postgres());
+        $reader->addPacker('pgsql', new KeyValue\Postgres());
 
-        $this->assertSame('host=127.0.0.1 port=5432 user=postgres db=postgres', $reader->getConnectionString());
+        $this->assertSame('host=127.0.0.1 port=5432 user=postgres dbname=postgres', $reader->getConnectionString());
     }
 }