From dde388e274286b4200689bf21f061a974e8bd847 Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Fri, 12 Sep 2014 16:52:39 +0200
Subject: [PATCH] update tests

---
 tests/async003.phpt  |  8 +++++--
 tests/async004.phpt  |  4 +++-
 tests/async005.phpt  |  4 +++-
 tests/async006.phpt  | 16 ++++++++++----
 tests/bound001.phpt  | 50 --------------------------------------------
 tests/bound002.phpt  |  3 ---
 tests/cancel001.phpt |  4 +++-
 tests/conv001.phpt   |  3 ---
 tests/res001.phpt    | 12 +++++++++--
 tests/trans002.phpt  |  8 +++++--
 tests/types002.phpt  |  3 ---
 11 files changed, 43 insertions(+), 72 deletions(-)
 delete mode 100644 tests/bound001.phpt

diff --git a/tests/async003.phpt b/tests/async003.phpt
index 20b08b9..e94b963 100644
--- a/tests/async003.phpt
+++ b/tests/async003.phpt
@@ -26,7 +26,7 @@ do {
 DONE
 --EXPECTF--
 Test
-object(pq\Result)#%d (7) {
+object(pq\Result)#%d (8) {
   ["status"]=>
   int(2)
   ["statusMessage"]=>
@@ -41,8 +41,10 @@ object(pq\Result)#%d (7) {
   int(1)
   ["fetchType"]=>
   int(0)
+  ["autoConvert"]=>
+  int(255)
 }
-object(pq\Result)#%d (7) {
+object(pq\Result)#%d (8) {
   ["status"]=>
   int(2)
   ["statusMessage"]=>
@@ -57,5 +59,7 @@ object(pq\Result)#%d (7) {
   int(1)
   ["fetchType"]=>
   int(0)
+  ["autoConvert"]=>
+  int(255)
 }
 DONE
diff --git a/tests/async004.phpt b/tests/async004.phpt
index 5802950..d3db3f7 100644
--- a/tests/async004.phpt
+++ b/tests/async004.phpt
@@ -27,7 +27,7 @@ do {
 DONE
 --EXPECTF--
 Test
-object(pq\Result)#%d (7) {
+object(pq\Result)#%d (8) {
   ["status"]=>
   int(2)
   ["statusMessage"]=>
@@ -42,5 +42,7 @@ object(pq\Result)#%d (7) {
   int(1)
   ["fetchType"]=>
   int(0)
+  ["autoConvert"]=>
+  int(255)
 }
 DONE
diff --git a/tests/async005.phpt b/tests/async005.phpt
index 669d0be..a956026 100644
--- a/tests/async005.phpt
+++ b/tests/async005.phpt
@@ -36,7 +36,7 @@ complete($s);
 DONE
 --EXPECTF--
 Test
-object(pq\Result)#%d (7) {
+object(pq\Result)#%d (8) {
   ["status"]=>
   int(2)
   ["statusMessage"]=>
@@ -51,5 +51,7 @@ object(pq\Result)#%d (7) {
   int(1)
   ["fetchType"]=>
   int(0)
+  ["autoConvert"]=>
+  int(255)
 }
 DONE
diff --git a/tests/async006.phpt b/tests/async006.phpt
index 6b4129a..178d78c 100644
--- a/tests/async006.phpt
+++ b/tests/async006.phpt
@@ -27,7 +27,7 @@ do {
 DONE
 --EXPECTF--
 Test
-object(pq\Result)#%d (7) {
+object(pq\Result)#%d (8) {
   ["status"]=>
   int(9)
   ["statusMessage"]=>
@@ -42,8 +42,10 @@ object(pq\Result)#%d (7) {
   int(0)
   ["fetchType"]=>
   int(0)
+  ["autoConvert"]=>
+  int(255)
 }
-object(pq\Result)#%d (7) {
+object(pq\Result)#%d (8) {
   ["status"]=>
   int(9)
   ["statusMessage"]=>
@@ -58,8 +60,10 @@ object(pq\Result)#%d (7) {
   int(0)
   ["fetchType"]=>
   int(0)
+  ["autoConvert"]=>
+  int(255)
 }
-object(pq\Result)#%d (7) {
+object(pq\Result)#%d (8) {
   ["status"]=>
   int(9)
   ["statusMessage"]=>
@@ -74,8 +78,10 @@ object(pq\Result)#%d (7) {
   int(0)
   ["fetchType"]=>
   int(0)
+  ["autoConvert"]=>
+  int(255)
 }
-object(pq\Result)#%d (7) {
+object(pq\Result)#%d (8) {
   ["status"]=>
   int(2)
   ["statusMessage"]=>
@@ -90,5 +96,7 @@ object(pq\Result)#%d (7) {
   int(3)
   ["fetchType"]=>
   int(0)
+  ["autoConvert"]=>
+  int(255)
 }
 DONE
diff --git a/tests/bound001.phpt b/tests/bound001.phpt
deleted file mode 100644
index 9e1bc20..0000000
--- a/tests/bound001.phpt
+++ /dev/null
@@ -1,50 +0,0 @@
---TEST--
-fetch bound
---SKIPIF--
-<?php 
-include "_skipif.inc";
-if (pq\Types::DEFINED) {
-	die("skip pq\Types::DEFINED == true");
-} 
-?>
---FILE--
-<?php
-echo "Test\n";
-
-include "_setup.inc";
-
-$c = new pq\Connection(PQ_DSN);
-$r = $c->exec("select 1*a,2*a,3*a from generate_series(2,3) a");
-$r->bind(0, $a);
-$r->bind(1, $b);
-$r->bind(2, $c);
-while ($s = $r->fetchBound()) {
-	var_dump($s,$a,$b,$c);
-}
-?>
-DONE
---EXPECT--
-Test
-array(3) {
-  [0]=>
-  &string(1) "2"
-  [1]=>
-  &string(1) "4"
-  [2]=>
-  &string(1) "6"
-}
-string(1) "2"
-string(1) "4"
-string(1) "6"
-array(3) {
-  [0]=>
-  &string(1) "3"
-  [1]=>
-  &string(1) "6"
-  [2]=>
-  &string(1) "9"
-}
-string(1) "3"
-string(1) "6"
-string(1) "9"
-DONE
diff --git a/tests/bound002.phpt b/tests/bound002.phpt
index d6521ba..3633902 100644
--- a/tests/bound002.phpt
+++ b/tests/bound002.phpt
@@ -3,9 +3,6 @@ fetch bound
 --SKIPIF--
 <?php 
 include "_skipif.inc";
-if (!pq\Types::DEFINED) {
-	die("skip pq\Types::DEFINED == false");
-} 
 ?>
 --FILE--
 <?php
diff --git a/tests/cancel001.phpt b/tests/cancel001.phpt
index aa754ac..f763847 100644
--- a/tests/cancel001.phpt
+++ b/tests/cancel001.phpt
@@ -24,7 +24,7 @@ DONE
 --EXPECTF--
 Test
 bool(true)
-object(pq\Result)#%d (7) {
+object(pq\Result)#%d (8) {
   ["status"]=>
   int(7)
   ["statusMessage"]=>
@@ -39,6 +39,8 @@ object(pq\Result)#%d (7) {
   int(0)
   ["fetchType"]=>
   int(0)
+  ["autoConvert"]=>
+  int(255)
 }
 ERROR:  canceling statement due to user request
 DONE
diff --git a/tests/conv001.phpt b/tests/conv001.phpt
index 65328c3..7340c49 100644
--- a/tests/conv001.phpt
+++ b/tests/conv001.phpt
@@ -3,9 +3,6 @@ converter
 --SKIPIF--
 <?php
 include "_skipif.inc";
-if (!pq\Types::DEFINED) {
-	die("skip pq\\Types::DEFINED == false\n");
-}
 ?>
 --FILE--
 <?php
diff --git a/tests/res001.phpt b/tests/res001.phpt
index 89e0512..6cf307a 100644
--- a/tests/res001.phpt
+++ b/tests/res001.phpt
@@ -49,7 +49,11 @@ Warning: pq\Result not initialized in %s on line %d
 Warning: pq\Result not initialized in %s on line %d
 
 Warning: pq\Result not initialized in %s on line %d
-object(pq\Result)#%d (7) {
+
+Warning: pq\Result not initialized in %s on line %d
+
+Warning: pq\Result not initialized in %s on line %d
+object(pq\Result)#%d (8) {
   ["status"]=>
   NULL
   ["statusMessage"]=>
@@ -64,8 +68,10 @@ object(pq\Result)#%d (7) {
   int(0)
   ["fetchType"]=>
   int(0)
+  ["autoConvert"]=>
+  int(0)
 }
-array(8) {
+array(9) {
   ["dummy"]=>
   int(2)
   ["status"]=>
@@ -82,5 +88,7 @@ array(8) {
   int(0)
   ["fetchType"]=>
   int(0)
+  ["autoConvert"]=>
+  int(0)
 }
 Done
diff --git a/tests/trans002.phpt b/tests/trans002.phpt
index d65cde5..49c71d8 100644
--- a/tests/trans002.phpt
+++ b/tests/trans002.phpt
@@ -29,7 +29,7 @@ var_dump(
 DONE
 --EXPECTF--
 Test
-object(pq\Connection)#%d (18) {
+object(pq\Connection)#%d (19) {
   ["status"]=>
   int(0)
   ["transactionStatus"]=>
@@ -67,11 +67,13 @@ object(pq\Connection)#%d (18) {
   bool(false)
   ["defaultTransactionDeferrable"]=>
   bool(false)
+  ["defaultAutoConvert"]=>
+  int(255)
 }
 int(0)
 bool(false)
 bool(false)
-object(pq\Connection)#%d (18) {
+object(pq\Connection)#%d (19) {
   ["status"]=>
   int(0)
   ["transactionStatus"]=>
@@ -109,6 +111,8 @@ object(pq\Connection)#%d (18) {
   bool(false)
   ["defaultTransactionDeferrable"]=>
   bool(false)
+  ["defaultAutoConvert"]=>
+  int(255)
 }
 int(2)
 bool(true)
diff --git a/tests/types002.phpt b/tests/types002.phpt
index e6e6e70..431ee3e 100644
--- a/tests/types002.phpt
+++ b/tests/types002.phpt
@@ -3,9 +3,6 @@ extended type support
 --SKIPIF--
 <?php
 include "_skipif.inc";
-if (!pq\Types::DEFINED) {
-	die("skip pq\\Types::DEFINED == false\n");
-}
 ?>
 --INI--
 date.timezone=UTC
-- 
2.30.2