upgrade pq\Types

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

diff --git a/tests/conv001.phpt b/tests/conv001.phpt
index 64488b5164e95c2ae11e6495697942e47b80af23..546f00ff7fff58236d43aefe9123eb6155caf96d 100644 (file)
--- a/tests/conv001.phpt
+++ b/tests/conv001.phpt
@@ -131,13 +131,13 @@ $t = new pq\Types($c);
 
 $c->setConverter(new HStoreConverter($t));
 $c->setConverter(new IntVectorConverter($t));
-if (!defined("pq\\Types::JSON")) {
+if (!(defined("pq\\Types::JSON") && defined("pq\\Result::CONV_JSON"))) {
        $c->setConverter(new JSONConverter($t));
 }
 $c->setConverter(new BoxConverter($t));
 
 $r = $c->execParams("SELECT \$1 as hs, \$2 as iv, \$3 as oids, \$4 as js, \$5 as ia, \$6 as ta, \$7 as ba, \$8 as da, \$9 as dbl, \$10 as bln, ".
-               "\$11 as dt1, \$12 as dt2, \$13 as dt3, \$14 as dt4, \$15 as dt5, \$16 as dt6, \$17 as dt7, \$18 as dt8, \$19 as txta, \$20 as boxa",
+               "\$11 as dt1, \$12 as dt3, \$13 as dt4, \$14 as dt5, \$15 as dt7, \$16 as dt8, \$17 as txta, \$18 as boxa",
        array(
                // hstore
                array(
@@ -178,8 +178,6 @@ $r = $c->execParams("SELECT \$1 as hs, \$2 as iv, \$3 as oids, \$4 as js, \$5 as
                new pq\Datetime,
                new pq\Datetime,
                new pq\Datetime,
-               new pq\Datetime,
-               new pq\Datetime,
                // text array
                [new Text(0), new Text(" or "), new Text(true)],
                // box array
@@ -197,11 +195,9 @@ $r = $c->execParams("SELECT \$1 as hs, \$2 as iv, \$3 as oids, \$4 as js, \$5 as
                $t["float4"]->oid,
                $t["bool"]->oid,
                $t["date"]->oid,
-               $t["abstime"]->oid,
                $t["timestamp"]->oid,
                $t["timestamptz"]->oid,
                $t["date"]->oid,
-               $t["abstime"]->oid,
                $t["timestamp"]->oid,
                $t["timestamptz"]->oid,
                $t["_text"]->oid,
@@ -324,39 +320,28 @@ array(1) {
       string(3) "UTC"
     }
     [11]=>
-    object(pq\DateTime)#%d (4) {
-      ["format"]=>
-      string(11) "Y-m-d H:i:s"
-      ["date"]=>
-      string(26) "%d-%d-%d %d:%d:%d.000000"
-      ["timezone_type"]=>
-      int(1)
-      ["timezone"]=>
-      string(%d) "%s"
-    }
-    [12]=>
     object(pq\DateTime)#%d (4) {
       ["format"]=>
       string(13) "Y-m-d H:i:s.u"
       ["date"]=>
-      string(26) "%d-%d-%d %d:%d:%d.000000"
+      string(26) "%d-%d-%d %d:%d:%d.%d"
       ["timezone_type"]=>
       int(3)
       ["timezone"]=>
       string(3) "UTC"
     }
-    [13]=>
+    [12]=>
     object(pq\DateTime)#%d (4) {
       ["format"]=>
       string(14) "Y-m-d H:i:s.uO"
       ["date"]=>
-      string(26) "%d-%d-%d %d:%d:%d.000000"
+      string(26) "%d-%d-%d %d:%d:%d.%d"
       ["timezone_type"]=>
       int(1)
       ["timezone"]=>
       string(%d) "%s"
     }
-    [14]=>
+    [13]=>
     object(pq\DateTime)#%d (4) {
       ["format"]=>
       string(5) "Y-m-d"
@@ -367,40 +352,29 @@ array(1) {
       ["timezone"]=>
       string(3) "UTC"
     }
-    [15]=>
-    object(pq\DateTime)#%d (4) {
-      ["format"]=>
-      string(11) "Y-m-d H:i:s"
-      ["date"]=>
-      string(26) "%d-%d-%d %d:%d:%d.000000"
-      ["timezone_type"]=>
-      int(1)
-      ["timezone"]=>
-      string(%d) "%s"
-    }
-    [16]=>
+    [14]=>
     object(pq\DateTime)#%d (4) {
       ["format"]=>
       string(13) "Y-m-d H:i:s.u"
       ["date"]=>
-      string(26) "%d-%d-%d %d:%d:%d.000000"
+      string(26) "%d-%d-%d %d:%d:%d.%d"
       ["timezone_type"]=>
       int(3)
       ["timezone"]=>
       string(3) "UTC"
     }
-    [17]=>
+    [15]=>
     object(pq\DateTime)#%d (4) {
       ["format"]=>
       string(14) "Y-m-d H:i:s.uO"
       ["date"]=>
-      string(26) "%d-%d-%d %d:%d:%d.000000"
+      string(26) "%d-%d-%d %d:%d:%d.%d"
       ["timezone_type"]=>
       int(1)
       ["timezone"]=>
       string(%d) "%s"
     }
-    [18]=>
+    [16]=>
     array(3) {
       [0]=>
       string(1) "0"
@@ -409,7 +383,7 @@ array(1) {
       [2]=>
       string(1) "1"
     }
-    [19]=>
+    [17]=>
     array(2) {
       [0]=>
       object(Box)#%d (2) {