X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fphp_pqres.c;h=2b983685658730bc5e024a029648138e241a181c;hb=ff4439a509c64757948265ff83956bccef03c06e;hp=6e1fa681090aa1f476f1362e6b26e80ae277d03c;hpb=10e7d6adccdd55554f1512de5e829a75aef62461;p=m6w6%2Fext-pq

diff --git a/src/php_pqres.c b/src/php_pqres.c
index 6e1fa68..2b98368 100644
--- a/src/php_pqres.c
+++ b/src/php_pqres.c
@@ -511,6 +511,79 @@ static void php_pqres_object_read_error_message(zval *object, void *o, zval *ret
 	}
 }
 
+static void php_pqres_object_read_diag(zval *object, void *o, zval *return_value TSRMLS_DC)
+{
+	php_pqres_object_t *obj = o;
+	int i;
+	struct {
+		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"},
+#endif
+#ifdef PG_DIAG_SOURCE_FUNCTION
+			{PG_DIAG_SOURCE_FUNCTION,	"source_function"},
+#endif
+	};
+
+	array_init_size(return_value, 32);
+	for (i = 0; i < sizeof(diag)/sizeof(diag[0]); ++i) {
+		char *value = PQresultErrorField(obj->intern->res, diag[i].code);
+
+		if (value) {
+			add_assoc_string(return_value, diag[i].name, value, 1);
+		} else {
+			add_assoc_null(return_value, diag[i].name);
+		}
+	}
+}
+
 static void php_pqres_object_read_num_rows(zval *object, void *o, zval *return_value TSRMLS_DC)
 {
 	php_pqres_object_t *obj = o;
@@ -1195,6 +1268,10 @@ PHP_MINIT_FUNCTION(pqres)
 	ph.read = php_pqres_object_read_error_message;
 	zend_hash_add(&php_pqres_object_prophandlers, "errorMessage", sizeof("errorMessage"), (void *) &ph, sizeof(ph), NULL);
 
+	zend_declare_property_null(php_pqres_class_entry, ZEND_STRL("diag"), ZEND_ACC_PUBLIC TSRMLS_CC);
+	ph.read = php_pqres_object_read_diag;
+	zend_hash_add(&php_pqres_object_prophandlers, "diag", sizeof("diag"), (void *) &ph, sizeof(ph), NULL);
+
 	zend_declare_property_long(php_pqres_class_entry, ZEND_STRL("numRows"), 0, ZEND_ACC_PUBLIC TSRMLS_CC);
 	ph.read = php_pqres_object_read_num_rows;
 	zend_hash_add(&php_pqres_object_prophandlers, "numRows", sizeof("numRows"), (void *) &ph, sizeof(ph), NULL);