[5.1] Fix pgsql header version error (#5484)

* fix pgsql header version error * remove php8.4
swoole · Sep 23, 2024 · 620c7ac · 620c7ac
1 parent 20add68
commit 620c7ac
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 deletions.
diff --git a/.github/workflows/framework.yml b/.github/workflows/framework.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: [ '8.0', '8.1', '8.2', '8.3', '8.4' ]
+        php-version: [ '8.0', '8.1', '8.2', '8.3' ]
         framework: [ 'Laravel Octane', 'Hyperf', 'Simps', 'imi' ]
     name: ${{ matrix.framework }} - PHP ${{ matrix.php-version }}
     steps:

diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['8.0', '8.1', '8.2', '8.3', '8.4-dev']
+        php: ['8.0', '8.1', '8.2', '8.3']
     steps:
     - uses: actions/checkout@v4
     - name: Setup PHP

diff --git a/.github/workflows/xdebug.yml b/.github/workflows/xdebug.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['8.0', '8.1', '8.2', '8.3', '8.4-dev']
+        php: ['8.0', '8.1', '8.2', '8.3']
 
     name: PHP ${{ matrix.php }} - Swoole
 

diff --git a/ext-src/php_swoole_pgsql.h b/ext-src/php_swoole_pgsql.h
@@ -25,6 +25,18 @@ BEGIN_EXTERN_C()
 
 #include "ext/pdo/php_pdo_driver.h"
 
+#if PHP_VERSION_ID >= 80000 && PHP_VERSION_ID < 80100
+#include "thirdparty/php80/pdo_pgsql/php_pdo_pgsql_int.h"
+#elif PHP_VERSION_ID >= 80100 && PHP_VERSION_ID < 80200
+#include "thirdparty/php81/pdo_pgsql/php_pdo_pgsql_int.h"
+#elif PHP_VERSION_ID >= 80200 && PHP_VERSION_ID < 80300
+#include "thirdparty/php81/pdo_pgsql/php_pdo_pgsql_int.h"
+#elif PHP_VERSION_ID >= 80300 && PHP_VERSION_ID < 80400
+#include "thirdparty/php83/pdo_pgsql/php_pdo_pgsql_int.h"
+#else
+#include "thirdparty/php84/pdo_pgsql/php_pdo_pgsql_int.h"
+#endif
+
 extern const pdo_driver_t swoole_pdo_pgsql_driver;
 
 #include <libpq-fe.h>

diff --git a/ext-src/swoole_pgsql.cc b/ext-src/swoole_pgsql.cc
@@ -22,11 +22,6 @@
 #include "swoole_coroutine_system.h"
 
 #ifdef SW_USE_PGSQL
-#if PHP_VERSION_ID > 80100
-#include "thirdparty/php81/pdo_pgsql/php_pdo_pgsql_int.h"
-#else
-#include "thirdparty/php80/pdo_pgsql/php_pdo_pgsql_int.h"
-#endif
 
 using swoole::Coroutine;
 using swoole::Reactor;