update tests

diff --git a/tests/async003.phpt b/tests/async003.phpt
index 20b08b907b7f91582565fe2ac6c3e8acf16e9459..e94b963c905d1dfa6113606c9480ac24a1dca29c 100644 (file)
--- a/tests/async003.phpt
+++ b/tests/async003.phpt
@@ -26,7 +26,7 @@ do {
 DONE
 --EXPECTF--
 Test
 DONE
 --EXPECTF--
 Test

-object(pq\Result)#%d (7) {
+object(pq\Result)#%d (8) {

   ["status"]=>
   int(2)
   ["statusMessage"]=>
   ["status"]=>
   int(2)
   ["statusMessage"]=>


@@ -41,8 +41,10 @@ object(pq\Result)#%d (7) {
   int(1)
   ["fetchType"]=>
   int(0)
   int(1)
   ["fetchType"]=>
   int(0)

+  ["autoConvert"]=>
+  int(255)

 }
 }

-object(pq\Result)#%d (7) {
+object(pq\Result)#%d (8) {

   ["status"]=>
   int(2)
   ["statusMessage"]=>
   ["status"]=>
   int(2)
   ["statusMessage"]=>


@@ -57,5 +59,7 @@ object(pq\Result)#%d (7) {
   int(1)
   ["fetchType"]=>
   int(0)
   int(1)
   ["fetchType"]=>
   int(0)

+  ["autoConvert"]=>
+  int(255)

 }
 DONE
 }
 DONE

diff --git a/tests/async004.phpt b/tests/async004.phpt
index 580295049ea4ea8518a9d8c450403267e8ce791c..d3db3f70b65819b899a02ca086e5663ed8e72d65 100644 (file)
--- a/tests/async004.phpt
+++ b/tests/async004.phpt
@@ -27,7 +27,7 @@ do {
 DONE
 --EXPECTF--
 Test
 DONE
 --EXPECTF--
 Test

-object(pq\Result)#%d (7) {
+object(pq\Result)#%d (8) {

   ["status"]=>
   int(2)
   ["statusMessage"]=>
   ["status"]=>
   int(2)
   ["statusMessage"]=>


@@ -42,5 +42,7 @@ object(pq\Result)#%d (7) {
   int(1)
   ["fetchType"]=>
   int(0)
   int(1)
   ["fetchType"]=>
   int(0)

+  ["autoConvert"]=>
+  int(255)

 }
 DONE
 }
 DONE

diff --git a/tests/async005.phpt b/tests/async005.phpt
index 669d0be32b99c7cc953ef5faa23b2dcb5b63f513..a956026ffa551074ac276ad58eedc55aeb23be68 100644 (file)
--- a/tests/async005.phpt
+++ b/tests/async005.phpt
@@ -36,7 +36,7 @@ complete($s);
 DONE
 --EXPECTF--
 Test
 DONE
 --EXPECTF--
 Test

-object(pq\Result)#%d (7) {
+object(pq\Result)#%d (8) {

   ["status"]=>
   int(2)
   ["statusMessage"]=>
   ["status"]=>
   int(2)
   ["statusMessage"]=>


@@ -51,5 +51,7 @@ object(pq\Result)#%d (7) {
   int(1)
   ["fetchType"]=>
   int(0)
   int(1)
   ["fetchType"]=>
   int(0)

+  ["autoConvert"]=>
+  int(255)

 }
 DONE
 }
 DONE

diff --git a/tests/async006.phpt b/tests/async006.phpt
index 6b4129ab03888bcb47f785608f2d5e576fd99a30..178d78c4adaf68d372aaca00fddd9797104f1969 100644 (file)
--- a/tests/async006.phpt
+++ b/tests/async006.phpt
@@ -27,7 +27,7 @@ do {
 DONE
 --EXPECTF--
 Test
 DONE
 --EXPECTF--
 Test

-object(pq\Result)#%d (7) {
+object(pq\Result)#%d (8) {

   ["status"]=>
   int(9)
   ["statusMessage"]=>
   ["status"]=>
   int(9)
   ["statusMessage"]=>


@@ -42,8 +42,10 @@ object(pq\Result)#%d (7) {
   int(0)
   ["fetchType"]=>
   int(0)
   int(0)
   ["fetchType"]=>
   int(0)

+  ["autoConvert"]=>
+  int(255)

 }
 }

-object(pq\Result)#%d (7) {
+object(pq\Result)#%d (8) {

   ["status"]=>
   int(9)
   ["statusMessage"]=>
   ["status"]=>
   int(9)
   ["statusMessage"]=>


@@ -58,8 +60,10 @@ object(pq\Result)#%d (7) {
   int(0)
   ["fetchType"]=>
   int(0)
   int(0)
   ["fetchType"]=>
   int(0)

+  ["autoConvert"]=>
+  int(255)

 }
 }

-object(pq\Result)#%d (7) {
+object(pq\Result)#%d (8) {

   ["status"]=>
   int(9)
   ["statusMessage"]=>
   ["status"]=>
   int(9)
   ["statusMessage"]=>


@@ -74,8 +78,10 @@ object(pq\Result)#%d (7) {
   int(0)
   ["fetchType"]=>
   int(0)
   int(0)
   ["fetchType"]=>
   int(0)

+  ["autoConvert"]=>
+  int(255)

 }
 }

-object(pq\Result)#%d (7) {
+object(pq\Result)#%d (8) {

   ["status"]=>
   int(2)
   ["statusMessage"]=>
   ["status"]=>
   int(2)
   ["statusMessage"]=>


@@ -90,5 +96,7 @@ object(pq\Result)#%d (7) {
   int(3)
   ["fetchType"]=>
   int(0)
   int(3)
   ["fetchType"]=>
   int(0)

+  ["autoConvert"]=>
+  int(255)

 }
 DONE
 }
 DONE

diff --git a/tests/bound001.phpt b/tests/bound001.phpt
deleted file mode 100644 (file)
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 d6521ba6e5217691ee148f2f7cc1c97f8d92a46e..36339021a2459a4164532c4520d16746eb05d3c2 100644 (file)
--- a/tests/bound002.phpt
+++ b/tests/bound002.phpt
@@ -3,9 +3,6 @@ fetch bound
 --SKIPIF--
 <?php 
 include "_skipif.inc";
 --SKIPIF--
 <?php 
 include "_skipif.inc";

-if (!pq\Types::DEFINED) {
-       die("skip pq\Types::DEFINED == false");
-} 

 ?>
 --FILE--
 <?php
 ?>
 --FILE--
 <?php

diff --git a/tests/cancel001.phpt b/tests/cancel001.phpt
index aa754acb91716987816898feb6024d62b0e0f283..f763847d1651424adb4b31c486efc703a1ea5c2c 100644 (file)
--- a/tests/cancel001.phpt
+++ b/tests/cancel001.phpt
@@ -24,7 +24,7 @@ DONE
 --EXPECTF--
 Test
 bool(true)
 --EXPECTF--
 Test
 bool(true)

-object(pq\Result)#%d (7) {
+object(pq\Result)#%d (8) {

   ["status"]=>
   int(7)
   ["statusMessage"]=>
   ["status"]=>
   int(7)
   ["statusMessage"]=>


@@ -39,6 +39,8 @@ object(pq\Result)#%d (7) {
   int(0)
   ["fetchType"]=>
   int(0)
   int(0)
   ["fetchType"]=>
   int(0)

+  ["autoConvert"]=>
+  int(255)

 }
 ERROR:  canceling statement due to user request
 DONE
 }
 ERROR:  canceling statement due to user request
 DONE

diff --git a/tests/conv001.phpt b/tests/conv001.phpt
index 65328c3bb1b630022eac2d8deed75a452cbf0c05..7340c49eb6aea5d86e7370cfa23a5be179086560 100644 (file)
--- a/tests/conv001.phpt
+++ b/tests/conv001.phpt
@@ -3,9 +3,6 @@ converter
 --SKIPIF--
 <?php
 include "_skipif.inc";
 --SKIPIF--
 <?php
 include "_skipif.inc";

-if (!pq\Types::DEFINED) {
-       die("skip pq\\Types::DEFINED == false\n");
-}

 ?>
 --FILE--
 <?php
 ?>
 --FILE--
 <?php

diff --git a/tests/res001.phpt b/tests/res001.phpt
index 89e0512655e4d30f0105938c0a355decca0c1196..6cf307af220daf87886c5536c642e6e739e6b4b3 100644 (file)
--- 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
 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"]=>
   ["status"]=>
   NULL
   ["statusMessage"]=>


@@ -64,8 +68,10 @@ object(pq\Result)#%d (7) {
   int(0)
   ["fetchType"]=>
   int(0)
   int(0)
   ["fetchType"]=>
   int(0)

+  ["autoConvert"]=>
+  int(0)

 }
 }

-array(8) {
+array(9) {

   ["dummy"]=>
   int(2)
   ["status"]=>
   ["dummy"]=>
   int(2)
   ["status"]=>


@@ -82,5 +88,7 @@ array(8) {
   int(0)
   ["fetchType"]=>
   int(0)
   int(0)
   ["fetchType"]=>
   int(0)

+  ["autoConvert"]=>
+  int(0)

 }
 Done
 }
 Done

diff --git a/tests/trans002.phpt b/tests/trans002.phpt
index d65cde5c60f15e62aa07a11b30359b75d84a570e..49c71d820fe37b46f5b4dd3aac7e938b33770da0 100644 (file)
--- a/tests/trans002.phpt
+++ b/tests/trans002.phpt
@@ -29,7 +29,7 @@ var_dump(
 DONE
 --EXPECTF--
 Test
 DONE
 --EXPECTF--
 Test

-object(pq\Connection)#%d (18) {
+object(pq\Connection)#%d (19) {

   ["status"]=>
   int(0)
   ["transactionStatus"]=>
   ["status"]=>
   int(0)
   ["transactionStatus"]=>


@@ -67,11 +67,13 @@ object(pq\Connection)#%d (18) {
   bool(false)
   ["defaultTransactionDeferrable"]=>
   bool(false)
   bool(false)
   ["defaultTransactionDeferrable"]=>
   bool(false)

+  ["defaultAutoConvert"]=>
+  int(255)

 }
 int(0)
 bool(false)
 bool(false)
 }
 int(0)
 bool(false)
 bool(false)

-object(pq\Connection)#%d (18) {
+object(pq\Connection)#%d (19) {

   ["status"]=>
   int(0)
   ["transactionStatus"]=>
   ["status"]=>
   int(0)
   ["transactionStatus"]=>


@@ -109,6 +111,8 @@ object(pq\Connection)#%d (18) {
   bool(false)
   ["defaultTransactionDeferrable"]=>
   bool(false)
   bool(false)
   ["defaultTransactionDeferrable"]=>
   bool(false)

+  ["defaultAutoConvert"]=>
+  int(255)

 }
 int(2)
 bool(true)
 }
 int(2)
 bool(true)

diff --git a/tests/types002.phpt b/tests/types002.phpt
index e6e6e70de70288fc83c1b288eff705fb8ec4ae39..431ee3e1408734a74f688c0c06bb53d08b8a71be 100644 (file)
--- a/tests/types002.phpt
+++ b/tests/types002.phpt
@@ -3,9 +3,6 @@ extended type support
 --SKIPIF--
 <?php
 include "_skipif.inc";
 --SKIPIF--
 <?php
 include "_skipif.inc";

-if (!pq\Types::DEFINED) {
-       die("skip pq\\Types::DEFINED == false\n");
-}

 ?>
 --INI--
 date.timezone=UTC
 ?>
 --INI--
 date.timezone=UTC