cvs: php4 /pear/DB/tests errors.inc limit.inc numrows.inc tableinfo.inc
| From: | Thomas V.V.Cox | Date: | Sun, 06 Jan 2002 04:56:12 +0000 |
| Subject: | cvs: php4 /pear/DB/tests errors.inc limit.inc numrows.inc tableinfo.inc | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-1845@lists.php.net to get a copy of this message | ||
cox Sat Jan 5 23:56:12 2002 EDT
Modified files:
/php4/pear/DB/tests errors.inc limit.inc numrows.inc tableinfo.inc
Log:
test updates
Index: php4/pear/DB/tests/errors.inc
diff -u php4/pear/DB/tests/errors.inc:1.2 php4/pear/DB/tests/errors.inc:1.3
--- php4/pear/DB/tests/errors.inc:1.2 Thu Mar 22 20:15:06 2001
+++ php4/pear/DB/tests/errors.inc Sat Jan 5 23:56:12 2002
@@ -26,15 +26,13 @@
print "Trying to provoke DB_ERROR_CONSTRAINT\n";
$dbh->setErrorHandling(PEAR_ERROR_RETURN);
-$dbh->query("DROP TABLE a");
$dbh->query("DROP TABLE b");
+$dbh->query("DROP TABLE a");
$dbh->setErrorHandling(PEAR_ERROR_CALLBACK, "errhandler");
$dbh->query("CREATE TABLE a (a INTEGER NOT NULL, PRIMARY KEY(a))");
$dbh->query("CREATE TABLE b (b INTEGER REFERENCES a(a))");
$dbh->query("INSERT INTO a VALUES(1)");
$dbh->query("INSERT INTO b VALUES(2)");
-$dbh->query("DROP TABLE a");
-$dbh->query("DROP TABLE b");
print "Trying to provoke DB_ERROR_DIVZERO\n";
$dbh->query("SELECT 0/0");
Index: php4/pear/DB/tests/limit.inc
diff -u php4/pear/DB/tests/limit.inc:1.4 php4/pear/DB/tests/limit.inc:1.5
--- php4/pear/DB/tests/limit.inc:1.4 Thu Nov 29 20:30:32 2001
+++ php4/pear/DB/tests/limit.inc Sat Jan 5 23:56:12 2002
@@ -15,7 +15,8 @@
$dbh->query("INSERT INTO php_limit VALUES('result $i')");
}
// Hack for upper case col returned by Oracle
-if($dbh->dsn['phptype'] == 'oci8') {
+if ($dbh->dsn['phptype'] == 'oci8' &&
+ $dbh->options['optimize'] != 'portability') {
$key = 'A';
} else {
$key = 'a';
Index: php4/pear/DB/tests/numrows.inc
diff -u php4/pear/DB/tests/numrows.inc:1.5 php4/pear/DB/tests/numrows.inc:1.6
--- php4/pear/DB/tests/numrows.inc:1.5 Thu Mar 22 20:15:06 2001
+++ php4/pear/DB/tests/numrows.inc Sat Jan 5 23:56:12 2002
@@ -41,7 +41,4 @@
} else {
print "\n";
}
-$dbh->setErrorHandling(PEAR_ERROR_CALLBACK, "errhandler");
-$test = $dbh->numRows(false);
-
?>
Index: php4/pear/DB/tests/tableinfo.inc
diff -u php4/pear/DB/tests/tableinfo.inc:1.3 php4/pear/DB/tests/tableinfo.inc:1.4
--- php4/pear/DB/tests/tableinfo.inc:1.3 Mon Dec 31 14:11:21 2001
+++ php4/pear/DB/tests/tableinfo.inc Sat Jan 5 23:56:12 2002
@@ -1,9 +1,13 @@
<?php
-
+function pe($o){
+ die($o->toString());
+}
$dbh->setErrorHandling(PEAR_ERROR_RETURN);
$dbh->query("DROP TABLE phptest_fk");
-$dbh->setErrorHandling(PEAR_ERROR_DIE);
+$dbh->setErrorHandling(PEAR_ERROR_CALLBACK,'pe');
+
+$dbh->query("DELETE FROM phptest");
$dbh->query("INSERT INTO phptest VALUES(1, 'one', 'One',
'2001-02-16')");
$dbh->query("INSERT INTO phptest VALUES(2, 'two', 'Two',
'2001-02-15')");
$dbh->query("INSERT INTO phptest VALUES(3, 'three', 'Three',
'2001-02-14')");