fix tests

diff --git a/ext/pdo_pgsql/tests/bug62498-32bit.phpt b/ext/pdo_pgsql/tests/bug62498-32bit.phpt
index 3727ed7d1182e03c60b1e9871d6d939c2fe15ffb..edcf52048c822d54389a292e0f0e9dcf249d0058 100644 (file)
--- a/ext/pdo_pgsql/tests/bug62498-32bit.phpt
+++ b/ext/pdo_pgsql/tests/bug62498-32bit.phpt
@@ -43,13 +43,17 @@ var_dump($meta);
 
 ?>
 Done
---EXPECT--
+--EXPECTF--
 Begin test...
 array(9) {
   [0]=>
-  array(6) {
+  array(8) {
     ["pgsql:oid"]=>
     int(21)
+    ["pgsql:table_oid"]=>
+    int(%d)
+    ["table"]=>
+    string(13) "bugtest_62498"
     ["native_type"]=>
     string(4) "int2"
     ["name"]=>
@@ -62,9 +66,13 @@ array(9) {
     int(1)
   }
   [1]=>
-  array(6) {
+  array(8) {
     ["pgsql:oid"]=>
     int(23)
+    ["pgsql:table_oid"]=>
+    int(%d)
+    ["table"]=>
+    string(13) "bugtest_62498"
     ["native_type"]=>
     string(4) "int4"
     ["name"]=>
@@ -77,9 +85,13 @@ array(9) {
     int(1)
   }
   [2]=>
-  array(6) {
+  array(8) {
     ["pgsql:oid"]=>
     int(20)
+    ["pgsql:table_oid"]=>
+    int(%d)
+    ["table"]=>
+    string(13) "bugtest_62498"
     ["native_type"]=>
     string(4) "int8"
     ["name"]=>
@@ -92,9 +104,13 @@ array(9) {
     int(2)
   }
   [3]=>
-  array(6) {
+  array(8) {
     ["pgsql:oid"]=>
     int(1043)
+    ["pgsql:table_oid"]=>
+    int(%d)
+    ["table"]=>
+    string(13) "bugtest_62498"
     ["native_type"]=>
     string(7) "varchar"
     ["name"]=>
@@ -107,9 +123,13 @@ array(9) {
     int(2)
   }
   [4]=>
-  array(6) {
+  array(8) {
     ["pgsql:oid"]=>
     int(16)
+    ["pgsql:table_oid"]=>
+    int(%d)
+    ["table"]=>
+    string(13) "bugtest_62498"
     ["native_type"]=>
     string(4) "bool"
     ["name"]=>
@@ -122,9 +142,13 @@ array(9) {
     int(5)
   }
   [5]=>
-  array(6) {
+  array(8) {
     ["pgsql:oid"]=>
     int(1082)
+    ["pgsql:table_oid"]=>
+    int(%d)
+    ["table"]=>
+    string(13) "bugtest_62498"
     ["native_type"]=>
     string(4) "date"
     ["name"]=>
@@ -137,9 +161,13 @@ array(9) {
     int(2)
   }
   [6]=>
-  array(6) {
+  array(8) {
     ["pgsql:oid"]=>
     int(25)
+    ["pgsql:table_oid"]=>
+    int(%d)
+    ["table"]=>
+    string(13) "bugtest_62498"
     ["native_type"]=>
     string(4) "text"
     ["name"]=>
@@ -152,9 +180,13 @@ array(9) {
     int(2)
   }
   [7]=>
-  array(6) {
+  array(8) {
     ["pgsql:oid"]=>
     int(1114)
+    ["pgsql:table_oid"]=>
+    int(%d)
+    ["table"]=>
+    string(13) "bugtest_62498"
     ["native_type"]=>
     string(9) "timestamp"
     ["name"]=>
@@ -167,9 +199,13 @@ array(9) {
     int(2)
   }
   [8]=>
-  array(6) {
+  array(8) {
     ["pgsql:oid"]=>
     int(17)
+    ["pgsql:table_oid"]=>
+    int(%d)
+    ["table"]=>
+    string(13) "bugtest_62498"
     ["native_type"]=>
     string(5) "bytea"
     ["name"]=>

diff --git a/ext/pdo_pgsql/tests/bug62498.phpt b/ext/pdo_pgsql/tests/bug62498.phpt
index ed25899990c35ba636f6b509d4b9a78225d80126..53d42fc3fa8905ece303aad1c59b2046a4d3ef95 100644 (file)
--- a/ext/pdo_pgsql/tests/bug62498.phpt
+++ b/ext/pdo_pgsql/tests/bug62498.phpt
@@ -43,13 +43,17 @@ var_dump($meta);
 
 ?>
 Done
---EXPECT--
+--EXPECTF--
 Begin test...
 array(9) {
   [0]=>
-  array(6) {
+  array(8) {
     ["pgsql:oid"]=>
     int(21)
+    ["pgsql:table_oid"]=>
+    int(%d)
+    ["table"]=>
+    string(13) "bugtest_62498"
     ["native_type"]=>
     string(4) "int2"
     ["name"]=>
@@ -62,9 +66,13 @@ array(9) {
     int(1)
   }
   [1]=>
-  array(6) {
+  array(8) {
     ["pgsql:oid"]=>
     int(23)
+    ["pgsql:table_oid"]=>
+    int(%d)
+    ["table"]=>
+    string(13) "bugtest_62498"
     ["native_type"]=>
     string(4) "int4"
     ["name"]=>
@@ -77,9 +85,13 @@ array(9) {
     int(1)
   }
   [2]=>
-  array(6) {
+  array(8) {
     ["pgsql:oid"]=>
     int(20)
+    ["pgsql:table_oid"]=>
+    int(%d)
+    ["table"]=>
+    string(13) "bugtest_62498"
     ["native_type"]=>
     string(4) "int8"
     ["name"]=>
@@ -92,9 +104,13 @@ array(9) {
     int(1)
   }
   [3]=>
-  array(6) {
+  array(8) {
     ["pgsql:oid"]=>
     int(1043)
+    ["pgsql:table_oid"]=>
+    int(%d)
+    ["table"]=>
+    string(13) "bugtest_62498"
     ["native_type"]=>
     string(7) "varchar"
     ["name"]=>
@@ -107,9 +123,13 @@ array(9) {
     int(2)
   }
   [4]=>
-  array(6) {
+  array(8) {
     ["pgsql:oid"]=>
     int(16)
+    ["pgsql:table_oid"]=>
+    int(%d)
+    ["table"]=>
+    string(13) "bugtest_62498"
     ["native_type"]=>
     string(4) "bool"
     ["name"]=>
@@ -122,9 +142,13 @@ array(9) {
     int(5)
   }
   [5]=>
-  array(6) {
+  array(8) {
     ["pgsql:oid"]=>
     int(1082)
+    ["pgsql:table_oid"]=>
+    int(%d)
+    ["table"]=>
+    string(13) "bugtest_62498"
     ["native_type"]=>
     string(4) "date"
     ["name"]=>
@@ -137,9 +161,13 @@ array(9) {
     int(2)
   }
   [6]=>
-  array(6) {
+  array(8) {
     ["pgsql:oid"]=>
     int(25)
+    ["pgsql:table_oid"]=>
+    int(%d)
+    ["table"]=>
+    string(13) "bugtest_62498"
     ["native_type"]=>
     string(4) "text"
     ["name"]=>
@@ -152,9 +180,13 @@ array(9) {
     int(2)
   }
   [7]=>
-  array(6) {
+  array(8) {
     ["pgsql:oid"]=>
     int(1114)
+    ["pgsql:table_oid"]=>
+    int(%d)
+    ["table"]=>
+    string(13) "bugtest_62498"
     ["native_type"]=>
     string(9) "timestamp"
     ["name"]=>
@@ -167,9 +199,13 @@ array(9) {
     int(2)
   }
   [8]=>
-  array(6) {
+  array(8) {
     ["pgsql:oid"]=>
     int(17)
+    ["pgsql:table_oid"]=>
+    int(%d)
+    ["table"]=>
+    string(13) "bugtest_62498"
     ["native_type"]=>
     string(5) "bytea"
     ["name"]=>