From: Michael Wallner <mike@php.net>
Date: Fri, 20 May 2016 08:44:48 +0000 (+0200)
Subject: Merge branch 'v1.1.x'
X-Git-Tag: v2.1.1~3
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=b00e81afafdb7bc6e76b6ef4d283f5b5fb8feec7;hp=57a45f1b0e9febc74a4fc268950d590d709885b0;p=m6w6%2Fext-pq

Merge branch 'v1.1.x'
---

diff --git a/src/php_pqres.c b/src/php_pqres.c
index f8a0e8f..363b7fb 100644
--- a/src/php_pqres.c
+++ b/src/php_pqres.c
@@ -485,23 +485,57 @@ static void php_pqres_object_read_diag(zval *object, void *o, zval *return_value
 		char code;
 		const char *const name;
 	} diag[] = {
+#ifdef PG_DIAG_SEVERITY
 			{PG_DIAG_SEVERITY,			"severity"},
+#endif
+#ifdef PG_DIAG_SQLSTATE
 			{PG_DIAG_SQLSTATE,			"sqlstate"},
+#endif
+#ifdef PG_DIAG_MESSAGE_PRIMARY
 			{PG_DIAG_MESSAGE_PRIMARY,	"message_primary"},
+#endif
+#ifdef PG_DIAG_MESSAGE_DETAIL
 			{PG_DIAG_MESSAGE_DETAIL,	"message_detail"},
+#endif
+#ifdef PG_DIAG_MESSAGE_HINT
 			{PG_DIAG_MESSAGE_HINT,		"message_hint"},
+#endif
+#ifdef PG_DIAG_STATEMENT_POSITION
 			{PG_DIAG_STATEMENT_POSITION,"statement_position"},
+#endif
+#ifdef PG_DIAG_INTERNAL_POSITION
 			{PG_DIAG_INTERNAL_POSITION,	"internal_position"},
+#endif
+#ifdef PG_DIAG_INTERNAL_QUERY
 			{PG_DIAG_INTERNAL_QUERY,	"internal_query"},
+#endif
+#ifdef PG_DIAG_CONTEXT
 			{PG_DIAG_CONTEXT,			"context"},
+#endif
+#ifdef PG_DIAG_SCHEMA_NAME
 			{PG_DIAG_SCHEMA_NAME,		"schema_name"},
+#endif
+#ifdef PG_DIAG_TABLE_NAME
 			{PG_DIAG_TABLE_NAME,		"table_name"},
+#endif
+#ifdef PG_DIAG_COLUMN_NAME
 			{PG_DIAG_COLUMN_NAME,		"column_name"},
+#endif
+#ifdef PG_DIAG_DATATYPE_NAME
 			{PG_DIAG_DATATYPE_NAME,		"datatype_name"},
+#endif
+#ifdef PG_DIAG_CONSTRAINT_NAME
 			{PG_DIAG_CONSTRAINT_NAME,	"constraint_name"},
+#endif
+#ifdef PG_DIAG_SOURCE_FILE
 			{PG_DIAG_SOURCE_FILE,		"source_file"},
+#endif
+#ifdef PG_DIAG_SOURCE_LINE
 			{PG_DIAG_SOURCE_LINE,		"source_line"},
-			{PG_DIAG_SOURCE_FUNCTION,	"source_function"}
+#endif
+#ifdef PG_DIAG_SOURCE_FUNCTION
+			{PG_DIAG_SOURCE_FUNCTION,	"source_function"},
+#endif
 	};
 
 	array_init_size(return_value, 32);