fix test

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

diff --git a/tests/conv001.phpt b/tests/conv001.phpt
index 3020945136aecebbca5718e8b514917143c8e8b9..7e778e99479e7c286fb2781b43a9de673e5d2225 100644 (file)
--- a/tests/conv001.phpt
+++ b/tests/conv001.phpt
@@ -4,13 +4,15 @@ converter
 <?php
 include "_skipif.inc";
 ?>
+--INI--
+date.timezone=UTC
 --FILE--
 <?php
 echo "Test\n";
 
 include "_setup.inc";
 
-abstract class Converter implements pq\ConverterInterface
+abstract class Converter implements pq\Converter
 {
        protected $types;
        
@@ -25,11 +27,11 @@ class HStoreConverter extends Converter
                return [ $this->types["hstore"]->oid ];
        }
        
-       function convertFromString($string) {
+       function convertFromString($string, $type) {
                return eval("return [$string];");
        }
        
-       function convertToString($data) {
+       function convertToString($data, $type) {
                $string = "";
                foreach ($data as $k => $v) {
                        if (isset($v)) {
@@ -51,11 +53,11 @@ class IntVectorConverter extends Converter
                ];
        }
        
-       function convertFromString($string) {
+       function convertFromString($string, $type) {
                return array_map("intval", explode(" ", $string));
        }
        
-       function convertToString($data) {
+       function convertToString($data, $type) {
                return implode(" ", $data);
        }
 }
@@ -66,24 +68,36 @@ class JSONConverter extends Converter
                return [ $this->types["json"]->oid ];
        }
        
-       function convertFromString($string) {
+       function convertFromString($string, $type) {
                return json_decode($string);
        }
        
-       function convertToString($data) {
+       function convertToString($data, $type) {
                return json_encode($data);
        }
 }
 
+class Text {
+       private $data;
+       function __construct($data) {
+               $this->data = $data;
+       }
+       function __toString() {
+               return (string) $this->data;
+       }
+}
+
 $c = new pq\Connection(PQ_DSN);
 $c->exec("CREATE EXTENSION IF NOT EXISTS hstore");
 $t = new pq\Types($c);
 
 $c->setConverter(new HStoreConverter($t));
 $c->setConverter(new IntVectorConverter($t));
-$c->setConverter(new JSONConverter($t));
-
-$r = $c->execParams("SELECT \$1 as hs, \$2 as iv, \$3 as oids, \$4 as js",
+if (!defined("pq\\Types::JSON")) {
+       $c->setConverter(new JSONConverter($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 ",
        array(
                // hstore
                array(
@@ -107,13 +121,47 @@ $r = $c->execParams("SELECT \$1 as hs, \$2 as iv, \$3 as oids, \$4 as js",
                                "c" => 3,
                        ),
                        "str" => "äüö"
-               )
+               ),
+               // arrays
+               array(array(array(1,2,3))),
+               array(array("a\"","b}",null)),
+               array(true,false),
+               array(1.1,2.2),
+               // double
+               123.456,
+               // bool
+               true,
+               // datetimes
+               new pq\Datetime,
+               new pq\Datetime,
+               new pq\Datetime,
+               new pq\Datetime,
+               new pq\Datetime,
+               new pq\Datetime,
+               new pq\Datetime,
+               new pq\Datetime,
+               [new Text(0), new Text(" or "), new Text(true)],
        ),
        array(
                $t["hstore"]->oid,
                $t["int2vector"]->oid,
                $t["oidvector"]->oid,
-               $t["json"]->oid
+               $t["json"]->oid,
+               $t["_int4"]->oid,
+               $t["_text"]->oid,
+               $t["_bool"]->oid,
+               $t["_float8"]->oid,
+               $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
        )
 );
 
@@ -125,7 +173,7 @@ Done
 Test
 array(1) {
   [0]=>
-  array(4) {
+  array(%d) {
     [0]=>
     array(3) {
       ["k1"]=>
@@ -175,6 +223,148 @@ array(1) {
       ["str"]=>
       string(6) "äüö"
     }
+    [4]=>
+    array(1) {
+      [0]=>
+      array(1) {
+        [0]=>
+        array(3) {
+          [0]=>
+          int(1)
+          [1]=>
+          int(2)
+          [2]=>
+          int(3)
+        }
+      }
+    }
+    [5]=>
+    array(1) {
+      [0]=>
+      array(3) {
+        [0]=>
+        string(2) "a""
+        [1]=>
+        string(2) "b}"
+        [2]=>
+        NULL
+      }
+    }
+    [6]=>
+    array(2) {
+      [0]=>
+      bool(true)
+      [1]=>
+      bool(false)
+    }
+    [7]=>
+    array(2) {
+      [0]=>
+      float(1.1)
+      [1]=>
+      float(2.2)
+    }
+    [8]=>
+    float(123.456)
+    [9]=>
+    bool(true)
+    [10]=>
+    object(pq\DateTime)#%d (4) {
+      ["format"]=>
+      string(5) "Y-m-d"
+      ["date"]=>
+      string(26) "%d-%d-%d 00:00:00.000000"
+      ["timezone_type"]=>
+      int(3)
+      ["timezone"]=>
+      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"
+      ["timezone_type"]=>
+      int(3)
+      ["timezone"]=>
+      string(3) "UTC"
+    }
+    [13]=>
+    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"
+      ["timezone_type"]=>
+      int(1)
+      ["timezone"]=>
+      string(%d) "%s"
+    }
+    [14]=>
+    object(pq\DateTime)#%d (4) {
+      ["format"]=>
+      string(5) "Y-m-d"
+      ["date"]=>
+      string(26) "%d-%d-%d 00:00:00.000000"
+      ["timezone_type"]=>
+      int(3)
+      ["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]=>
+    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"
+      ["timezone_type"]=>
+      int(3)
+      ["timezone"]=>
+      string(3) "UTC"
+    }
+    [17]=>
+    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"
+      ["timezone_type"]=>
+      int(1)
+      ["timezone"]=>
+      string(%d) "%s"
+    }
+    [18]=>
+    array(3) {
+      [0]=>
+      string(1) "0"
+      [1]=>
+      string(4) " or "
+      [2]=>
+      string(1) "1"
+    }
   }
 }
 Done