Fix GH-12969: Fixed PDO::getAttribute() to get PDO::ATTR_STRINGIFY_FE…

…TCHES Partial backport of GH-12793. Closes GH-12970.
php · Dec 22, 2023 · b333164 · b333164
1 parent 7c4763a
commit b333164
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/NEWS b/NEWS
@@ -29,6 +29,10 @@ PHP                                                                        NEWS
   . Fixed bug GH-12987 (openssl_csr_sign might leak new cert on error).
     (Jakub Zelenka)
 
+- PDO:
+  . Fix GH-12969 (Fixed PDO::getAttribute() to get PDO::ATTR_STRINGIFY_FETCHES).
+    (SakiTakamachi)
+
 - PDO_ODBC:
   . Fixed bug GH-12767 (Unable to turn on autocommit mode with setAttribute()).
     (SakiTakamachi)
@@ -67,7 +71,7 @@ PHP                                                                        NEWS
 
 - FTP:
   . Fixed bug GH-9348 (FTP & SSL session reuse). (nielsdos)
-   
+
 - Intl:
   . Fixed bug GH-12635 (Test bug69398.phpt fails with ICU 74.1). (nielsdos)
 

diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c
@@ -930,8 +930,13 @@ PHP_METHOD(PDO, getAttribute)
 				add_next_index_zval(return_value, &dbh->def_stmt_ctor_args);
 			}
 			return;
+
 		case PDO_ATTR_DEFAULT_FETCH_MODE:
 			RETURN_LONG(dbh->default_fetch_type);
+
+		case PDO_ATTR_STRINGIFY_FETCHES:
+			RETURN_BOOL(dbh->stringify);
+
 		default:
 			break;
 	}

diff --git a/ext/pdo_mysql/tests/bug68371.phpt b/ext/pdo_mysql/tests/bug68371.phpt
@@ -96,6 +96,6 @@ array(1) {
 ERR
 ERR
 string(5) "mysql"
-ERR
+bool(false)
 ERR
 int(4)
diff --git a/ext/pdo_pgsql/tests/bug68371.phpt b/ext/pdo_pgsql/tests/bug68371.phpt
@@ -95,6 +95,6 @@ array(1) {
 ERR
 ERR
 string(5) "pgsql"
-ERR
+bool(true)
 ERR
 int(4)
-Original file line number
+Diff line change
@@ Expand Up / @@ -96,6 +96,6 @@ array(1) { @@
     ERR
     ERR
     string(5) "mysql"
-    ERR
+    bool(false)
     ERR
     int(4)