Changed return value for lastInsertId for 8.1+

yitam · yitam · commit 7a2f570603d2 · 2021-11-18T14:52:57.000-08:00
diff --git a/source/pdo_sqlsrv/pdo_dbh.cpp b/source/pdo_sqlsrv/pdo_dbh.cpp
@@ -1616,7 +1616,7 @@ zend_string * pdo_sqlsrv_dbh_last_id(_Inout_ pdo_dbh_t *dbh, _In_ const zend_str
         str[0] = '\0';
         return str;
 #else
-        return NULL;
+        return ZSTR_EMPTY_ALLOC();
 #endif
     }
 
diff --git a/test/functional/pdo_sqlsrv/pdo_lastInsertId.phpt b/test/functional/pdo_sqlsrv/pdo_lastInsertId.phpt
@@ -40,7 +40,7 @@ try {
 
 
 ?>
---EXPECTREGEX--
-string\(3\) "200"
-string\(3\) "102"
-(string\(0\) ""|bool\(false\))
+--EXPECT--
+string(3) "200"
+string(3) "102"
+string(0) ""

Original file line number	Diff line number	Diff line change
`@@ -1616,7 +1616,7 @@ zend_string * pdo_sqlsrv_dbh_last_id(_Inout_ pdo_dbh_t *dbh, _In_ const zend_str`
`1616`	`1616`	`str[0] = '\0';`
`1617`	`1617`	`return str;`
`1618`	`1618`	`#else`
`1619`		`- return NULL;`
	`1619`	`+ return ZSTR_EMPTY_ALLOC();`
`1620`	`1620`	`#endif`
`1621`	`1621`	`}`
`1622`	`1622`