Merge pull request #91 from clue-labs/connect-without-database

Fix "bad handshake" error when connecting without database name
friends-of-reactphp · Jan 11, 2019 · 4acae8d · 4acae8d
2 parents 6cf4b91 + 8815d5c
commit 4acae8d
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 1 deletion.
diff --git a/src/Commands/AuthenticateCommand.php b/src/Commands/AuthenticateCommand.php
@@ -44,7 +44,7 @@ public function authenticatePacket($scramble, Buffer $buffer)
             . "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
             . $this->user . "\x00"
             . $this->getAuthToken($scramble, $this->passwd, $buffer)
-            . ($this->dbname ? $this->dbname . "\x00" : '');
+            . $this->dbname . "\x00";
     }
 
     public function getAuthToken($scramble, $password, Buffer $buffer)

diff --git a/tests/FactoryTest.php b/tests/FactoryTest.php
@@ -160,6 +160,24 @@ public function testConnectWithValidAuthWillRunUntilQuit()
         $loop->run();
     }
 
+    public function testConnectWithValidAuthAndWithoutDbNameWillRunUntilQuit()
+    {
+        $this->expectOutputString('connected.closed.');
+
+        $loop = \React\EventLoop\Factory::create();
+        $factory = new Factory($loop);
+
+        $uri = $this->getConnectionString(array('dbname' => ''));
+        $factory->createConnection($uri)->then(function (ConnectionInterface $connection) {
+            echo 'connected.';
+            $connection->quit()->then(function () {
+                echo 'closed.';
+            });
+        }, 'printf')->then(null, 'printf');
+
+        $loop->run();
+    }
+
     public function testConnectWithValidAuthWillIgnoreNegativeTimeoutAndRunUntilQuit()
     {
         $this->expectOutputString('connected.closed.');

diff --git a/tests/ResultQueryTest.php b/tests/ResultQueryTest.php
@@ -359,6 +359,25 @@ public function testSimpleSelect()
         $loop->run();
     }
 
+    /**
+     * @depends testSimpleSelect
+     */
+    public function testSimpleSelectFromLazyConnectionWithoutDatabaseNameReturnsSameData()
+    {
+        $loop = \React\EventLoop\Factory::create();
+        $factory = new Factory($loop);
+
+        $uri = $this->getConnectionString(array('dbname' => ''));
+        $connection = $factory->createLazyConnection($uri);
+
+        $connection->query('select * from test.book')->then(function (QueryResult $command) {
+            $this->assertCount(2, $command->resultRows);
+        })->done();
+
+        $connection->quit();
+        $loop->run();
+    }
+
     public function testInvalidSelectShouldFail()
     {
         $loop = \React\EventLoop\Factory::create();