Skip to content

Commit

Permalink
[5.1]Sync PHP 8.3 pdo code (#5360)
Browse files Browse the repository at this point in the history
* sync PHP 8.3 pdo code

* fix error
  • Loading branch information
NathanFreeman committed Jun 6, 2024
1 parent e35090e commit 8e8db8b
Show file tree
Hide file tree
Showing 17 changed files with 5,966 additions and 9 deletions.
15 changes: 12 additions & 3 deletions config.m4
Original file line number Diff line number Diff line change
Expand Up @@ -1059,23 +1059,29 @@ EOF
thirdparty/php80/pdo_pgsql/pgsql_driver.c \
thirdparty/php80/pdo_pgsql/pgsql_statement.c \
thirdparty/php81/pdo_pgsql/pgsql_driver.c \
thirdparty/php81/pdo_pgsql/pgsql_statement.c"
thirdparty/php81/pdo_pgsql/pgsql_statement.c \
thirdparty/php83/pdo_pgsql/pgsql_driver.c \
thirdparty/php83/pdo_pgsql/pgsql_statement.c"
fi

if test "$PHP_SWOOLE_ORACLE" != "no"; then
swoole_source_file="$swoole_source_file \
thirdparty/php80/pdo_oci/oci_driver.c \
thirdparty/php80/pdo_oci/oci_statement.c \
thirdparty/php81/pdo_oci/oci_driver.c \
thirdparty/php81/pdo_oci/oci_statement.c"
thirdparty/php81/pdo_oci/oci_statement.c \
thirdparty/php83/pdo_oci/oci_driver.c \
thirdparty/php83/pdo_oci/oci_statement.c"
fi

if test "$PHP_SWOOLE_ODBC" != "no"; then
swoole_source_file="$swoole_source_file \
thirdparty/php80/pdo_odbc/odbc_driver.c \
thirdparty/php80/pdo_odbc/odbc_stmt.c \
thirdparty/php81/pdo_odbc/odbc_driver.c \
thirdparty/php81/pdo_odbc/odbc_stmt.c"
thirdparty/php81/pdo_odbc/odbc_stmt.c \
thirdparty/php83/pdo_odbc/odbc_driver.c \
thirdparty/php83/pdo_odbc/odbc_stmt.c"
fi

if test "$PHP_SWOOLE_SQLITE" != "no"; then
Expand Down Expand Up @@ -1242,14 +1248,17 @@ EOF
if test "$PHP_SWOOLE_PGSQL" != "no"; then
PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/php80/pdo_pgsql)
PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/php81/pdo_pgsql)
PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/php83/pdo_pgsql)
fi
if test "$PHP_SWOOLE_ODBC" != "no"; then
PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/php80/pdo_odbc)
PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/php81/pdo_odbc)
PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/php83/pdo_odbc)
fi
if test "$PHP_SWOOLE_ORACLE" != "no"; then
PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/php80/pdo_oci)
PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/php81/pdo_oci)
PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/php83/pdo_oci)
fi
if test "$PHP_SWOOLE_SQLITE" != "no"; then
PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/php80/pdo_sqlite)
Expand Down
3 changes: 2 additions & 1 deletion thirdparty/php81/pdo_oci/oci_driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
#define SW_USE_ORACLE_HOOK
#include "php_swoole_oracle.h"

#if PHP_VERSION_ID >= 80100
#if PHP_VERSION_ID >= 80100 && PHP_VERSION_ID < 80300

#include "php.h"
#include "php_ini.h"
#include "ext/standard/info.h"
Expand Down
3 changes: 2 additions & 1 deletion thirdparty/php81/pdo_oci/oci_statement.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
#define SW_USE_ORACLE_HOOK
#include "php_swoole_oracle.h"

#if PHP_VERSION_ID >= 80100
#if PHP_VERSION_ID >= 80100 && PHP_VERSION_ID < 80300

#include "php.h"
#include "php_ini.h"
#include "ext/standard/info.h"
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/php81/pdo_odbc/odbc_driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#define SW_USE_ODBC_HOOK
#include "php_swoole_odbc.h"

#if PHP_VERSION_ID >= 80100
#if PHP_VERSION_ID >= 80100 && PHP_VERSION_ID < 80300

#include "php.h"
#include "php_ini.h"
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/php81/pdo_odbc/odbc_stmt.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#define SW_USE_ODBC_HOOK
#include "php_swoole_odbc.h"

#if PHP_VERSION_ID >= 80100
#if PHP_VERSION_ID >= 80100 && PHP_VERSION_ID < 80300

#include "php.h"
#include "php_ini.h"
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/php81/pdo_pgsql/pgsql_driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#define SW_USE_PGSQL_HOOK
#include "php_swoole_pgsql.h"

#if PHP_VERSION_ID >= 80100
#if PHP_VERSION_ID >= 80100 && PHP_VERSION_ID < 80300

#include "php.h"
#include "php_ini.h"
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/php81/pdo_pgsql/pgsql_statement.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#define SW_USE_PGSQL_HOOK
#include "php_swoole_pgsql.h"

#if PHP_VERSION_ID >= 80100
#if PHP_VERSION_ID >= 80100 && PHP_VERSION_ID < 80300

#include "php.h"
#include "php_ini.h"
Expand Down
Loading

0 comments on commit 8e8db8b

Please sign in to comment.