Fix connect() (#66)

* Fix reconnect after connect failed

* Add timeout param in connect()

Author: Yurunsoft

swoole_postgresql.cc

@@ -342,9 +342,12 @@ static PHP_METHOD(swoole_postgresql_coro, __construct) {}
 
 static PHP_METHOD(swoole_postgresql_coro, connect) {
     zval *conninfo;
+    double timeout = Socket::default_connect_timeout;
 
-    ZEND_PARSE_PARAMETERS_START(1, 1)
+    ZEND_PARSE_PARAMETERS_START(1, 2)
     Z_PARAM_ZVAL(conninfo)
+    Z_PARAM_OPTIONAL
+    Z_PARAM_DOUBLE(timeout)
     ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE);
 
     PGObject *object = php_swoole_postgresql_coro_get_object(ZEND_THIS);
@@ -385,6 +388,12 @@ static PHP_METHOD(swoole_postgresql_coro, connect) {
     object->status = CONNECTION_STARTED;
     object->connected = false;
 
+    ON_SCOPE_EXIT {
+        if (!object->connected) {
+            object->conn = NULL;
+        }
+    };
+
     PQsetnonblocking(pgsql, 1);
     PQsetNoticeProcessor(pgsql, _php_pgsql_notice_handler, object);
 
@@ -396,7 +405,7 @@ static PHP_METHOD(swoole_postgresql_coro, connect) {
         RETURN_FALSE;
     }
 
-    if (!object->yield(return_value, SW_EVENT_WRITE, Socket::default_connect_timeout)) {
+    if (!object->yield(return_value, SW_EVENT_WRITE, timeout)) {
         const char *feedback;
 
         switch (PQstatus(pgsql)) {

tests/unit/PostgreSQLTest.php

@@ -9,7 +9,7 @@ class PostgreSQLTest extends TestCase
     protected function getConn()
     {
         $pg = new Swoole\Coroutine\PostgreSQL();
-        $conn = $pg->connect(TEST_DB_URI);
+        $conn = $pg->connect(TEST_DB_URI, 5);
         $this->assertNotFalse($conn, (string) $pg->error);
 
         return $pg;
@@ -90,4 +90,14 @@ public function testNotConnected()
             $this->assertFalse($pg->metaData(''));
         });
     }
+    
+    public function testConnectFailed()
+    {
+        run(function () {
+            $pg = new Swoole\Coroutine\PostgreSQL();
+            $this->assertFalse($pg->connect(''));
+            $conn = $pg->connect(TEST_DB_URI);
+            $this->assertNotFalse($conn, (string) $pg->error);
+        });
+    }
 }