Fixed array parser compatibility with arrays of boxes

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

diff --git a/tests/types002.phpt b/tests/types002.phpt
index 123bd11705f3db941525a11027ec71f852a61c8e..7122cf1e3891a5bce26fcb1a1a6df75b0ea3d4b0 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


@@ -28,14 +25,15 @@ true as bool,
 1::abstime as abstime,
 '2013-01-01 01:01:01'::timestamp as timestamp,
 '2013-01-01 01:01:01 UTC'::timestamptz as timestamptz,
 1::abstime as abstime,
 '2013-01-01 01:01:01'::timestamp as timestamp,
 '2013-01-01 01:01:01 UTC'::timestamptz as timestamptz,

-array[array[1,2,3],array[4,5,6],array[NULL::int,NULL::int,NULL::int]] as intarray  
+array[array[1,2,3],array[4,5,6],array[NULL::int,NULL::int,NULL::int]] as intarray,
+array[box(point(1,2),point(2,3)),box(point(4,5),point(5,6))] as boxarray

 ");
 var_dump($r->fetchRow(pq\Result::FETCH_ASSOC));
 ?>
 DONE
 --EXPECTF--
 Test
 ");
 var_dump($r->fetchRow(pq\Result::FETCH_ASSOC));
 ?>
 DONE
 --EXPECTF--
 Test

-array(12) {
+array(13) {

   ["null"]=>
   NULL
   ["bool"]=>
   ["null"]=>
   NULL
   ["bool"]=>


@@ -55,7 +53,7 @@ array(12) {
     ["format"]=>
     string(5) "Y-m-d"
     ["date"]=>
     ["format"]=>
     string(5) "Y-m-d"
     ["date"]=>

-    string(19) "2013-01-01 00:00:00"
+    string(%d) "2013-01-01 00:00:00%r(\.000000)?%r"

     ["timezone_type"]=>
     int(3)
     ["timezone"]=>
     ["timezone_type"]=>
     int(3)
     ["timezone"]=>


@@ -66,7 +64,7 @@ array(12) {
     ["format"]=>
     string(11) "Y-m-d H:i:s"
     ["date"]=>
     ["format"]=>
     string(11) "Y-m-d H:i:s"
     ["date"]=>

-    string(19) "1970-01-01 00:00:01"
+    string(%d) "1970-01-01 00:00:01%r(\.000000)?%r"

     ["timezone_type"]=>
     int(1)
     ["timezone"]=>
     ["timezone_type"]=>
     int(1)
     ["timezone"]=>


@@ -77,7 +75,7 @@ array(12) {
     ["format"]=>
     string(13) "Y-m-d H:i:s.u"
     ["date"]=>
     ["format"]=>
     string(13) "Y-m-d H:i:s.u"
     ["date"]=>

-    string(19) "2013-01-01 01:01:01"
+    string(%d) "2013-01-01 01:01:01%r(\.000000)?%r"

     ["timezone_type"]=>
     int(3)
     ["timezone"]=>
     ["timezone_type"]=>
     int(3)
     ["timezone"]=>


@@ -88,7 +86,7 @@ array(12) {
     ["format"]=>
     string(14) "Y-m-d H:i:s.uO"
     ["date"]=>
     ["format"]=>
     string(14) "Y-m-d H:i:s.uO"
     ["date"]=>

-    string(19) "2013-01-01 01:01:01"
+    string(%d) "2013-01-01 01:01:01%r(\.000000)?%r"

     ["timezone_type"]=>
     int(1)
     ["timezone"]=>
     ["timezone_type"]=>
     int(1)
     ["timezone"]=>


@@ -124,5 +122,12 @@ array(12) {
       NULL
     }
   }
       NULL
     }
   }

+  ["boxarray"]=>
+  array(2) {
+    [0]=>
+    string(11) "(2,3),(1,2)"
+    [1]=>
+    string(11) "(5,6),(4,5)"
+  }

 }
 DONE
\ No newline at end of file
 }
 DONE
\ No newline at end of file