Sync master, Refactor

Author: matyhtf

config.m4

@@ -82,7 +82,7 @@ if test "$PHP_SWOOLE_POSTGRESQL" != "no"; then
 
     PHP_ADD_LIBRARY(pthread, 1, SWOOLE_POSTGRESQL_SHARED_LIBADD)
 
-    swoole_source_file="swoole_postgresql_coro.cc"
+    swoole_source_file="swoole_postgresql.cc"
 
     PHP_NEW_EXTENSION(swoole_postgresql, $swoole_source_file, $ext_shared,,, cxx)
 

examples/timeout.php

@@ -0,0 +1,21 @@
+<?php
+
+use Swoole\Event;
+
+go(function () {
+    $pg = new Swoole\Coroutine\PostgreSQL();
+    $conn = $pg->connect("host=127.0.0.1;port=5432;dbname=test;user=postgres;password=postgres");
+    if (!$conn) {
+        var_dump($pg->error);
+        return;
+    }
+    $result = $pg->query('select pg_sleep(5)');
+    if (!$result) {
+        var_dump($pg->error);
+        return;
+    }
+    $arr = $pg->fetchAll($result);
+    var_dump($arr);
+});
+
+Event::wait();

swoole_postgresql_coro.h renamed to php_swoole_postgresql.h

@@ -11,6 +11,7 @@
   | [email protected] so we can mail you a copy immediately.            |
   +----------------------------------------------------------------------+
   | Author: Zhenyu Wu  <[email protected]>                                |
+  |         Tianfeng Han <[email protected]>                              |
   +----------------------------------------------------------------------+
  */
 #ifndef SWOOLE_POSTGRESQL_H_
@@ -20,10 +21,10 @@
 #include "ext/swoole/ext-src/php_swoole_cxx.h"
 #include "config.h"
 
-#define PHP_SWOOLE_EXT_POSTGRESQL_VERSION     "4.7.0"
-#define PHP_SWOOLE_EXT_POSTGRESQL_VERSION_ID  40700
+#define PHP_SWOOLE_EXT_PLUS_VERSION     "4.7.0"
+#define PHP_SWOOLE_EXT_PLUS_VERSION_ID  40700
 
-#if SWOOLE_API_VERSION_ID < 0x202107a
+#if SWOOLE_API_VERSION_ID < 0x202108a
 #error "Ext version does not match the Swoole version"
 #endif
 
@@ -35,41 +36,6 @@
 #include <postgresql/libpq-fe.h>
 #endif
 
-enum pg_query_type
-{
-    NORMAL_QUERY, META_DATA, PREPARE
-};
-
-struct pg_object {
-    PGconn *conn;
-    swoole::network::Socket *socket;
-    swoole::Coroutine *co;
-    PGresult *result;
-    zval *object;
-    zval _object;
-    ConnStatusType status;
-    enum pg_query_type request_type;
-    int row;
-    bool connected;
-    double timeout;
-    bool ignore_notices;
-    bool log_notices;
-    swoole::TimerNode *timer;
-};
-
-#define PGSQL_ASSOC           1<<0
-#define PGSQL_NUM             1<<1
-#define PGSQL_BOTH            (PGSQL_ASSOC|PGSQL_NUM)
-
-/* from postgresql/src/include/catalog/pg_type.h */
-#define BOOLOID     16
-#define BYTEAOID    17
-#define INT2OID     21
-#define INT4OID     23
-#define INT8OID     20
-#define TEXTOID     25
-#define OIDOID      26
-#define FLOAT4OID   700
-#define FLOAT8OID   701
+#include <zend_portability.h>
 
 #endif