Merge branch 'v1.1.x'

diff --combined tests/async003.phpt
index 9eb44df170a6bf5454351ad8725bb8796218e54a,2e72a9fa8dd22d12225828c0168acd52b79eea54..c78714def3519a65c4a5847567f65dd784a06693
--- 1/tests/async003.phpt
--- 2/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"]=>