From: Michael Wallner <mike@php.net>
Date: Tue, 17 May 2016 10:14:07 +0000 (+0200)
Subject: Merge branch 'v1.1.x'
X-Git-Tag: v2.1.0~7
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=commitdiff_plain;h=b9f66d2b7378c40f85111ef57e9b0922789f77df;hp=-c

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

b9f66d2b7378c40f85111ef57e9b0922789f77df
diff --combined tests/async003.phpt
index 9eb44df,2e72a9f..c78714d
--- a/tests/async003.phpt
+++ b/tests/async003.phpt
@@@ -16,7 -16,7 +16,7 @@@ do 
  	while ($c->busy) {
  		$r = array($c->socket);
  		$w = $e = null;
 -		if (stream_select($r, $w, $e, null)) {
 +		if (stream_select($r, $w, $e, 1, 1000)) {
  			$c->poll();
  		}
  	}
@@@ -26,13 -26,50 +26,50 @@@
  DONE
  --EXPECTF--
  Test
- object(pq\Result)#%d (8) {
+ object(pq\Result)#%d (9) {
    ["status"]=>
    int(2)
    ["statusMessage"]=>
    string(9) "TUPLES_OK"
    ["errorMessage"]=>
    string(0) ""
+   ["diag"]=>
+   array(17) {
+     ["severity"]=>
+     NULL
+     ["sqlstate"]=>
+     NULL
+     ["message_primary"]=>
+     NULL
+     ["message_detail"]=>
+     NULL
+     ["message_hint"]=>
+     NULL
+     ["statement_position"]=>
+     NULL
+     ["internal_position"]=>
+     NULL
+     ["internal_query"]=>
+     NULL
+     ["context"]=>
+     NULL
+     ["schema_name"]=>
+     NULL
+     ["table_name"]=>
+     NULL
+     ["column_name"]=>
+     NULL
+     ["datatype_name"]=>
+     NULL
+     ["constraint_name"]=>
+     NULL
+     ["source_file"]=>
+     NULL
+     ["source_line"]=>
+     NULL
+     ["source_function"]=>
+     NULL
+   }
    ["numRows"]=>
    int(1)
    ["numCols"]=>
@@@ -44,13 -81,50 +81,50 @@@
    ["autoConvert"]=>
    int(65535)
  }
- object(pq\Result)#%d (8) {
+ object(pq\Result)#%d (9) {
    ["status"]=>
    int(2)
    ["statusMessage"]=>
    string(9) "TUPLES_OK"
    ["errorMessage"]=>
    string(0) ""
+   ["diag"]=>
+   array(17) {
+     ["severity"]=>
+     NULL
+     ["sqlstate"]=>
+     NULL
+     ["message_primary"]=>
+     NULL
+     ["message_detail"]=>
+     NULL
+     ["message_hint"]=>
+     NULL
+     ["statement_position"]=>
+     NULL
+     ["internal_position"]=>
+     NULL
+     ["internal_query"]=>
+     NULL
+     ["context"]=>
+     NULL
+     ["schema_name"]=>
+     NULL
+     ["table_name"]=>
+     NULL
+     ["column_name"]=>
+     NULL
+     ["datatype_name"]=>
+     NULL
+     ["constraint_name"]=>
+     NULL
+     ["source_file"]=>
+     NULL
+     ["source_line"]=>
+     NULL
+     ["source_function"]=>
+     NULL
+   }
    ["numRows"]=>
    int(1)
    ["numCols"]=>