- Update tests

diff --git a/ext/pdo/tests/pdo_018.inc b/ext/pdo/tests/pdo_018.inc
index cecfc216f8d9bbcde5dc7d6bd051f29a6adc51aa..ed8c17f84161f7b0d61cd20febfbc2507e2080ef 100755 (executable)
--- a/ext/pdo/tests/pdo_018.inc
+++ b/ext/pdo/tests/pdo_018.inc
@@ -68,6 +68,8 @@ set_sql('select3', 'SELECT classtypes.name AS name, test.val AS val FROM test LE
 set_sql('select4', 'SELECT COUNT(*) FROM test LEFT JOIN classtypes ON test.classtype=classtypes.id WHERE (classtypes.id IS NULL OR classtypes.id > 0)');
 set_sql('select5', 'SELECT classtypes.name AS name, test.val AS val FROM test LEFT JOIN classtypes ON test.classtype=classtypes.id WHERE (classtypes.id IS NULL OR classtypes.id > 0)');
 
+$DB->setAttribute(PDO_ATTR_ERRMODE, PDO_ERRMODE_EXCEPTION);
+
 echo "===INIT===\n";
 $DB->exec($SQL['create1']);
 var_dump($DB->exec($SQL['insert1']));

diff --git a/ext/pdo_mysql/tests/pdo_018.phpt b/ext/pdo_mysql/tests/pdo_018.phpt
index 7155216c93288bdeece2b3c25ac7c68eaf0f610c..2a77a0a77cd23ba3317a552d1a16f8a6069acdfe 100755 (executable)
--- a/ext/pdo_mysql/tests/pdo_018.phpt
+++ b/ext/pdo_mysql/tests/pdo_018.phpt
@@ -58,7 +58,7 @@ array(4) {
   string(144) "a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}"
 }
 ===FAILURE===
-Exception:Class stdClass cannot be unserialized
+Exception:SQLSTATE[HY000]: General error: cannot unserialize class
 ===COUNT===
 string(1) "3"
 ===DATABASE===

diff --git a/ext/pdo_pgsql/tests/pdo_018.phpt b/ext/pdo_pgsql/tests/pdo_018.phpt
index bfb4bb85b8ef892467da68dda846732b4e957b32..250bdaa4d2cdddd5d182d6c0ca76ec6c617c72f6 100755 (executable)
--- a/ext/pdo_pgsql/tests/pdo_018.phpt
+++ b/ext/pdo_pgsql/tests/pdo_018.phpt
@@ -58,7 +58,7 @@ array(4) {
   string(144) "a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}"
 }
 ===FAILURE===
-Exception:Class stdClass cannot be unserialized
+Exception:SQLSTATE[HY000]: General error: cannot unserialize class
 ===COUNT===
 int(3)
 ===DATABASE===

diff --git a/ext/pdo_sqlite/tests/pdo_018.phpt b/ext/pdo_sqlite/tests/pdo_018.phpt
index 8a7339f9836b5b40c3f016cfab2624c43264582f..8fd5d1f267180e3b3201807068853b18e94fc499 100755 (executable)
--- a/ext/pdo_sqlite/tests/pdo_018.phpt
+++ b/ext/pdo_sqlite/tests/pdo_018.phpt
@@ -58,7 +58,7 @@ array(4) {
   string(144) "a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}"
 }
 ===FAILURE===
-Exception:Class stdClass cannot be unserialized
+Exception:SQLSTATE[HY000]: General error: cannot unserialize class
 ===COUNT===
 string(1) "3"
 ===DATABASE===