prepare v2.2.3

[m6w6/ext-pq] / tests / cancel001.phpt

diff --git a/tests/cancel001.phpt b/tests/cancel001.phpt
index 89c4931dcdbcc2692b5ca252ececd730d6e464c1..4ca9664aa8a390a7592982b27f35a9a323f23d46 100644 (file)
--- a/tests/cancel001.phpt
+++ b/tests/cancel001.phpt
@@ -9,26 +9,70 @@ echo "Test\n";
 include "_setup.inc";
 
 $c = new pq\Connection(PQ_DSN);
+try {
+       $c->exec("SET lc_messages TO 'C'");
+} catch (pq\Exception $e) {
+       // no not fail if we are not superuser
+}
 
 $x = new pq\Cancel($c);
 
-$c->execAsync("SELECT pg_sleep(2)");
+$c->execAsync("SELECT pg_sleep(10)");
 
 $x->cancel();
 
+var_dump($c === $x->connection);
 var_dump($c->getResult());
 printf("%s\n", $c->errorMessage);
 ?>
 DONE
 --EXPECTF--
 Test
-object(pq\Result)#%d (7) {
+bool(true)
+object(pq\Result)#%d (9) {
   ["status"]=>
   int(7)
   ["statusMessage"]=>
   string(11) "FATAL_ERROR"
   ["errorMessage"]=>
   string(47) "ERROR:  canceling statement due to user request"
+  ["diag"]=>
+  array(17) {
+    ["severity"]=>
+    string(5) "ERROR"
+    ["sqlstate"]=>
+    string(5) "57014"
+    ["message_primary"]=>
+    string(39) "canceling statement due to user request"
+    ["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"]=>
+    string(10) "postgres.c"
+    ["source_line"]=>
+    string(4) "%d"
+    ["source_function"]=>
+    string(17) "ProcessInterrupts"
+  }
   ["numRows"]=>
   int(0)
   ["numCols"]=>
@@ -37,6 +81,8 @@ object(pq\Result)#%d (7) {
   int(0)
   ["fetchType"]=>
   int(0)
+  ["autoConvert"]=>
+  int(65535)
 }
 ERROR:  canceling statement due to user request
 DONE