X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=src%2Fphp_pqres.c;fp=src%2Fphp_pqres.c;h=76518f2b73b1e9c5aa6ae34f7552c339806114ad;hp=1bc0d1d11ce5ad5446f99a84e3123f75b72049c3;hb=d607a4e70c0684d4b144203dfce40d7d69db6f3f;hpb=c314bfb70b6d4f6574d8923bfd59e2bd42621a00

diff --git a/src/php_pqres.c b/src/php_pqres.c
index 1bc0d1d..76518f2 100644
--- a/src/php_pqres.c
+++ b/src/php_pqres.c
@@ -477,6 +477,45 @@ 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)
+{
+	php_pqres_object_t *obj = o;
+	int i;
+	struct {
+		char code;
+		const char *const name;
+	} diag[] = {
+			{PG_DIAG_SEVERITY,			"severity"},
+			{PG_DIAG_SQLSTATE,			"sqlstate"},
+			{PG_DIAG_MESSAGE_PRIMARY,	"message_primary"},
+			{PG_DIAG_MESSAGE_DETAIL,	"message_detail"},
+			{PG_DIAG_MESSAGE_HINT,		"message_hint"},
+			{PG_DIAG_STATEMENT_POSITION,"statement_position"},
+			{PG_DIAG_INTERNAL_POSITION,	"internal_position"},
+			{PG_DIAG_INTERNAL_QUERY,	"internal_query"},
+			{PG_DIAG_CONTEXT,			"context"},
+			{PG_DIAG_SCHEMA_NAME,		"schema_name"},
+			{PG_DIAG_TABLE_NAME,		"table_name"},
+			{PG_DIAG_COLUMN_NAME,		"column_name"},
+			{PG_DIAG_DATATYPE_NAME,		"datatype_name"},
+			{PG_DIAG_CONSTRAINT_NAME,	"constraint_name"},
+			{PG_DIAG_SOURCE_FILE,		"source_file"},
+			{PG_DIAG_SOURCE_LINE,		"source_line"},
+			{PG_DIAG_SOURCE_FUNCTION,	"source_function"}
+	};
+
+	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);
+		} else {
+			add_assoc_null(return_value, diag[i].name);
+		}
+	}
+}
+
 static void php_pqres_object_read_num_rows(zval *object, void *o, zval *return_value)
 {
 	php_pqres_object_t *obj = o;
@@ -1125,7 +1164,15 @@ PHP_MINIT_FUNCTION(pqres)
 	ph.read = php_pqres_object_read_error_message;
 	zend_hash_str_add_mem(&php_pqres_object_prophandlers, "errorMessage", sizeof("errorMessage")-1, (void *) &ph, sizeof(ph));
 
+<<<<<<< HEAD
 	zend_declare_property_long(php_pqres_class_entry, ZEND_STRL("numRows"), 0, ZEND_ACC_PUBLIC);
+=======
+	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);
+>>>>>>> v1.1.x
 	ph.read = php_pqres_object_read_num_rows;
 	zend_hash_str_add_mem(&php_pqres_object_prophandlers, "numRows", sizeof("numRows")-1, (void *) &ph, sizeof(ph));