From 8abeac8975ca2cb680e362831c685102974ed7dd Mon Sep 17 00:00:00 2001
From: NathanFreeman <1056159381@qq.com>
Date: Fri, 20 Sep 2024 16:35:27 +0800
Subject: [PATCH] Fix pgsql non blocking error

---
 ext-src/swoole_oracle.cc | 11 ++++++-----
 ext-src/swoole_pgsql.cc  |  9 +++++++--
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/ext-src/swoole_oracle.cc b/ext-src/swoole_oracle.cc
index af7d90e4e92..ace8dc584fb 100644
--- a/ext-src/swoole_oracle.cc
+++ b/ext-src/swoole_oracle.cc
@@ -22,8 +22,6 @@
 
 #ifdef SW_USE_ORACLE
 
-using swoole::Coroutine;
-
 static bool swoole_oracle_blocking = true;
 void swoole_oracle_set_blocking(bool blocking) {
     swoole_oracle_blocking = blocking;
@@ -49,7 +47,8 @@ sword swoole_oci_stmt_prepare(
     OCIStmt *stmtp, OCIError *errhp, const OraText *stmt, ub4 stmt_len, ub4 language, ub4 mode) {
     swoole_trace_log(SW_TRACE_CO_ORACLE, "oci_stmt_prepare");
     sword result = 0;
-    php_swoole_async(swoole_oracle_blocking, [&]() { result = OCIStmtPrepare(stmtp, errhp, stmt, stmt_len, language, mode); });
+    php_swoole_async(swoole_oracle_blocking,
+                     [&]() { result = OCIStmtPrepare(stmtp, errhp, stmt, stmt_len, language, mode); });
 
     return result;
 }
@@ -64,7 +63,8 @@ sword swoole_oci_stmt_execute(OCISvcCtx *svchp,
                               ub4 mode) {
     swoole_trace_log(SW_TRACE_CO_ORACLE, "oci_stmt_execute");
     sword result = 0;
-    php_swoole_async(swoole_oracle_blocking, [&]() { result = OCIStmtExecute(svchp, stmtp, errhp, iters, rowoff, snap_in, snap_out, mode); });
+    php_swoole_async(swoole_oracle_blocking,
+                     [&]() { result = OCIStmtExecute(svchp, stmtp, errhp, iters, rowoff, snap_in, snap_out, mode); });
 
     return result;
 }
@@ -80,7 +80,8 @@ sword swoole_oci_stmt_fetch(OCIStmt *stmtp, OCIError *errhp, ub4 nrows, ub2 orie
 sword swoole_oci_stmt_fetch2(OCIStmt *stmtp, OCIError *errhp, ub4 nrows, ub2 orientation, sb4 scrollOffset, ub4 mode) {
     swoole_trace_log(SW_TRACE_CO_ORACLE, "oci_stmt_fetch2");
     sword result = 0;
-    php_swoole_async(swoole_oracle_blocking, [&]() { result = OCIStmtFetch2(stmtp, errhp, nrows, orientation, scrollOffset, mode); });
+    php_swoole_async(swoole_oracle_blocking,
+                     [&]() { result = OCIStmtFetch2(stmtp, errhp, nrows, orientation, scrollOffset, mode); });
 
     return result;
 }
diff --git a/ext-src/swoole_pgsql.cc b/ext-src/swoole_pgsql.cc
index b8c08903a58..260f08d708d 100644
--- a/ext-src/swoole_pgsql.cc
+++ b/ext-src/swoole_pgsql.cc
@@ -28,6 +28,7 @@
 #include "thirdparty/php80/pdo_pgsql/php_pdo_pgsql_int.h"
 #endif
 
+using swoole::Coroutine;
 using swoole::Reactor;
 using swoole::coroutine::Socket;
 using swoole::coroutine::translate_events_to_poll;
@@ -42,7 +43,7 @@ static int swoole_pgsql_socket_poll(PGconn *conn, swEventType event, double time
 
         int result = 0;
         do {
-             result = poll(fds, 1, timeout);
+            result = poll(fds, 1, timeout);
         } while (result < 0 && errno == EINTR);
 
         return result > 0 ? 1 : errno == ETIMEDOUT ? 0 : -1;
@@ -97,7 +98,11 @@ PGconn *swoole_pgsql_connectdb(const char *conninfo) {
         return conn;
     }
 
-    PQsetnonblocking(conn, 1);
+    if (!swoole_pgsql_blocking && Coroutine::get_current()) {
+        PQsetnonblocking(conn, 1);
+    } else {
+        PQsetnonblocking(conn, 0);
+    }
 
     SW_LOOP {
         int r = PQconnectPoll(conn);