From 26f9aa721178a35ce6a0e46f548c4ddb2537769c Mon Sep 17 00:00:00 2001
From: Anatol Belski <ab@php.net>
Date: Wed, 6 Apr 2016 17:42:23 +0200
Subject: fix tests

---
 ext/pdo_pgsql/tests/bug62498-32bit.phpt | 56 +++++++++++++++++++++++++++------
 ext/pdo_pgsql/tests/bug62498.phpt       | 56 +++++++++++++++++++++++++++------
 2 files changed, 92 insertions(+), 20 deletions(-)

diff --git a/ext/pdo_pgsql/tests/bug62498-32bit.phpt b/ext/pdo_pgsql/tests/bug62498-32bit.phpt
index 3727ed7d11..edcf52048c 100644
--- 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 ed25899990..53d42fc3fa 100644
--- 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"]=>
-- 
cgit v1.2.1