Merge branch 'v1.1.x'

[m6w6/ext-pq] / src / php_pqres.c

diff --git a/src/php_pqres.c b/src/php_pqres.c
index f8a0e8f958db66bcc8d8ffb6fb15519844af17ec..363b7fb9e1d07825d561128a9c29dc0d62497abf 100644 (file)
--- 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);