From 3e1138e99772668498427d84878baf0e5510a300 Mon Sep 17 00:00:00 2001 From: Kamil Tekiela Date: Mon, 25 Nov 2024 19:04:15 +0000 Subject: [PATCH] Remove disable_native_prepares --- ext/pdo_pgsql/pgsql_driver.c | 2 +- ext/pdo_pgsql/php_pdo_pgsql_int.h | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/ext/pdo_pgsql/pgsql_driver.c b/ext/pdo_pgsql/pgsql_driver.c index f29b4ca973cc6..c7944373fa7c7 100644 --- a/ext/pdo_pgsql/pgsql_driver.c +++ b/ext/pdo_pgsql/pgsql_driver.c @@ -295,7 +295,7 @@ static bool pgsql_handle_preparer(pdo_dbh_t *dbh, zend_string *sql, pdo_stmt_t * execute_only = 1; } } else { - emulate = H->disable_native_prepares || H->emulate_prepares; + emulate = H->emulate_prepares; execute_only = H->disable_prepares; } diff --git a/ext/pdo_pgsql/php_pdo_pgsql_int.h b/ext/pdo_pgsql/php_pdo_pgsql_int.h index da77d01c61ec7..7dee249cbb110 100644 --- a/ext/pdo_pgsql/php_pdo_pgsql_int.h +++ b/ext/pdo_pgsql/php_pdo_pgsql_int.h @@ -44,10 +44,7 @@ typedef struct { pdo_pgsql_error_info einfo; Oid pgoid; unsigned int stmt_counter; - /* The following two variables have the same purpose. Unfortunately we need - to keep track of two different attributes having the same effect. */ bool emulate_prepares; - bool disable_native_prepares; /* deprecated since 5.6 */ bool disable_prepares; HashTable *lob_streams; zend_fcall_info_cache *notice_callback;