com php-src: Implemented FR #74781 (Add the latest PG_DIAG_ * const): NEWS UPGRADING ext/pgsql/pgsql.c
| From: | Kalle Sommer Nielsen | Date: | Thu, 17 Aug 2017 19:04:41 +0000 |
| Subject: | com php-src: Implemented FR #74781 (Add the latest PG_DIAG_ * const): NEWS UPGRADING ext/pgsql/pgsql.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-99075@lists.php.net to get a copy of this message | ||
Commit: 1d9b46f3621db7f1f1d445d8168b8224d1fb4f02
Author: Kalle Sommer Nielsen <kalle@php.net> Thu, 17 Aug 2017 21:04:41 +0200
Parents: e164b3835ec5b8888253eeb2d9105747e6306f0f
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1d9b46f3621db7f1f1d445d8168b8224d1fb4f02
Log:
Implemented FR #74781 (Add the latest PG_DIAG_* const)
Bugs:
https://bugs.php.net/74781
Changed paths:
M NEWS
M UPGRADING
M ext/pgsql/pgsql.c
Diff:
diff --git a/NEWS b/NEWS
index 364bd09..d388c4c 100644
--- a/NEWS
+++ b/NEWS
@@ -36,6 +36,17 @@ PHP NEWS
. Fixed bug #74991 (include_path has a 4096 char limit in some cases).
(bwbroersma)
+- pgsql:
+ . Added new error constants for pg_result_error(): (Kalle)
+ - Requires Postgres 9.3
+ - PGSQL_DIAG_SCHEMA_NAME
+ - PGSQL_DIAG_TABLE_NAME
+ - PGSQL_DIAG_COLUMN_NAME
+ - PGSQL_DIAG_DATATYPE_NAME
+ - PGSQL_DIAG_CONSTRAINT_NAME
+ - Requires Postgres 9.6
+ - PGSQL_DIAG_SEVERITY_NONLOCALIZED
+
- Session:
. Fixed bug #74941 (session fails to start after having headers sent).
(morozov)
diff --git a/UPGRADING b/UPGRADING
index 390ceb4..b7cb5c9 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -72,6 +72,16 @@ Standard:
10. New Global Constants
========================================
+PGSQL:
+ . Requires Postgres 9.3
+ - PGSQL_DIAG_SCHEMA_NAME
+ - PGSQL_DIAG_TABLE_NAME
+ - PGSQL_DIAG_COLUMN_NAME
+ - PGSQL_DIAG_DATATYPE_NAME
+ - PGSQL_DIAG_CONSTRAINT_NAME
+ . Requires Postgres 9.6
+ - PGSQL_DIAG_SEVERITY_NONLOCALIZED
+
========================================
11. Changes to INI File Handling
========================================
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index 1fe26f7..07dcff9 100644
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -1194,6 +1194,24 @@ PHP_MINIT_FUNCTION(pgsql)
REGISTER_LONG_CONSTANT("PGSQL_DIAG_SOURCE_FILE", PG_DIAG_SOURCE_FILE, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("PGSQL_DIAG_SOURCE_LINE", PG_DIAG_SOURCE_LINE, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("PGSQL_DIAG_SOURCE_FUNCTION", PG_DIAG_SOURCE_FUNCTION, CONST_CS |
CONST_PERSISTENT);
+#ifdef PG_DIAG_SCHEMA_NAME
+ REGISTER_LONG_CONSTANT("PGSQL_DIAG_SCHEMA_NAME", PG_DIAG_SCHEMA_NAME, CONST_CS |
CONST_PERSISTENT);
+#endif
+#ifdef PG_DIAG_TABLE_NAME
+ REGISTER_LONG_CONSTANT("PGSQL_DIAG_TABLE_NAME", PG_DIAG_TABLE_NAME, CONST_CS |
CONST_PERSISTENT);
+#endif
+#ifdef PG_DIAG_COLUMN_NAME
+ REGISTER_LONG_CONSTANT("PGSQL_DIAG_COLUMN_NAME", PG_DIAG_COLUMN_NAME, CONST_CS |
CONST_PERSISTENT);
+#endif
+#ifdef PG_DIAG_DATATYPE_NAME
+ REGISTER_LONG_CONSTANT("PGSQL_DIAG_DATATYPE_NAME", PG_DIAG_DATATYPE_NAME, CONST_CS |
CONST_PERSISTENT);
+#endif
+#ifdef PG_DIAG_CONSTRAINT_NAME
+ REGISTER_LONG_CONSTANT("PGSQL_DIAG_CONSTRAINT_NAME", PG_DIAG_CONSTRAINT_NAME, CONST_CS |
CONST_PERSISTENT);
+#endif
+#ifdef PG_DIAG_SEVERITY_NONLOCALIZED
+ REGISTER_LONG_CONSTANT("PGSQL_DIAG_SEVERITY_NONLOCALIZED",
PG_DIAG_SEVERITY_NONLOCALIZED, CONST_CS | CONST_PERSISTENT);
+#endif
#endif
/* pg_convert options */
REGISTER_LONG_CONSTANT("PGSQL_CONV_IGNORE_DEFAULT", PGSQL_CONV_IGNORE_DEFAULT, CONST_CS
| CONST_PERSISTENT);