ext/pgsql adding PGSQL_ERRORS_SQLSTATE constant support.

devnexen · devnexen · commit cb832e56b1a1 · 2023-05-02T22:40:53.000+01:00
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
@@ -112,6 +112,10 @@ char pgsql_libpq_version[16];
 #define PQfreemem free
 #endif
 
+#if PG_VERSION_NUM < 120000
+#define PQERRORS_SQLSTATE 0
+#endif
+
 ZEND_DECLARE_MODULE_GLOBALS(pgsql)
 static PHP_GINIT_FUNCTION(pgsql);
 
@@ -2808,7 +2812,7 @@ PHP_FUNCTION(pg_set_error_verbosity)
 
 	pgsql = link->conn;
 
-	if (verbosity & (PQERRORS_TERSE|PQERRORS_DEFAULT|PQERRORS_VERBOSE)) {
+	if (verbosity & (PQERRORS_TERSE|PQERRORS_DEFAULT|PQERRORS_VERBOSE|PQERRORS_SQLSTATE)) {
 		RETURN_LONG(PQsetErrorVerbosity(pgsql, verbosity));
 	} else {
 		RETURN_FALSE;
diff --git a/ext/pgsql/pgsql.stub.php b/ext/pgsql/pgsql.stub.php
@@ -183,6 +183,13 @@
      * @cvalue PQERRORS_VERBOSE
      */
     const PGSQL_ERRORS_VERBOSE = UNKNOWN;
+    #if PGVERSION_NUM > 110000
+    /**
+     * @var int
+     * @cvalue PQERRORS_SQLSTATE
+     */
+    const PGSQL_ERRORS_SQLSTATE = UNKNOWN;
+    #endif
 
     /* For lo_seek() */
 
diff --git a/ext/pgsql/pgsql_arginfo.h b/ext/pgsql/pgsql_arginfo.h
diff --git a/ext/pgsql/tests/07optional.phpt b/ext/pgsql/tests/07optional.phpt
@@ -19,6 +19,7 @@ if (function_exists('pg_set_error_verbosity')) {
     pg_set_error_verbosity($db, PGSQL_ERRORS_TERSE);
     pg_set_error_verbosity($db, PGSQL_ERRORS_DEFAULT);
     pg_set_error_verbosity($db, PGSQL_ERRORS_VERBOSE);
+    pg_set_error_verbosity($db, PGSQL_ERRORS_SQLSTATE);
 }
 echo "OK";
 ?>

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ if (function_exists('pg_set_error_verbosity')) {`
`19`	`19`	`pg_set_error_verbosity($db, PGSQL_ERRORS_TERSE);`
`20`	`20`	`pg_set_error_verbosity($db, PGSQL_ERRORS_DEFAULT);`
`21`	`21`	`pg_set_error_verbosity($db, PGSQL_ERRORS_VERBOSE);`
	`22`	`+ pg_set_error_verbosity($db, PGSQL_ERRORS_SQLSTATE);`
`22`	`23`	`}`
`23`	`24`	`echo "OK";`
`24`	`25`	`?>`