cvs: pear /DB/tests simplequery.inc /DB/tests/driver 01connect.phpt 03simplequery.phpt

danielc Thu Apr 29 00:24:44 2004 EDT Modified files: /pear/DB/tests simplequery.inc /pear/DB/tests/driver 01connect.phpt 03simplequery.phpt Log: Fix tests so mysqli will pass. http://cvs.php.net/diff.php/pear/DB/tests/simplequery.inc?r1=1.5&r2=1.6&ty=u Index: pear/DB/tests/simplequery.inc diff -u pear/DB/tests/simplequery.inc:1.5 pear/DB/tests/simplequery.inc:1.6 --- pear/DB/tests/simplequery.inc:1.5 Fri Jan 23 12:53:05 2004 +++ pear/DB/tests/simplequery.inc Thu Apr 29 00:24:43 2004 @@ -23,7 +23,22 @@ $sth = $dbh->simpleQuery("SELECT * FROM phptest"); -print gettype($sth)."\n"; + +switch ($dbh->phptype) { + case 'mysqli': + if (is_a($sth, 'mysqli_result')) { + print "passed\n"; + } else { + print "PROBLEM\n"; + } + break; + default: + if (gettype($sth) == 'resource') { + print "passed\n"; + } else { + print "PROBLEM\n"; + } +} switch ($dbh->phptype) { http://cvs.php.net/diff.php/pear/DB/tests/driver/01connect.phpt?r1=1.7&r2=1.8&ty=u Index: pear/DB/tests/driver/01connect.phpt diff -u pear/DB/tests/driver/01connect.phpt:1.7 pear/DB/tests/driver/01connect.phpt:1.8 --- pear/DB/tests/driver/01connect.phpt:1.7 Wed Feb 11 12:36:36 2004 +++ pear/DB/tests/driver/01connect.phpt Thu Apr 29 00:24:44 2004 @@ -5,11 +5,24 @@ --FILE-- <?php require_once './connect.inc'; + if (is_object($dbh)) { print "\$dbh is an object\n"; } -if (is_resource($dbh->connection)) { - print "\$dbh is connected\n"; +switch ($dbh->phptype) { + case 'mysqli': + if (is_a($dbh, 'mysqli')) { + print "\$dbh is connected\n"; + } else { + print "\$dbh NOT connected\n"; + } + break; + default: + if (gettype($dbh) == 'resource') { + print "\$dbh is connected\n"; + } else { + print "\$dbh NOT connected\n"; + } } @@ -25,13 +38,23 @@ if (DB::isError($dbha)) { die("connect.inc: ".$dbha->toString()); } - if (is_object($dbha)) { print "\$dbha is an object\n"; } - -if (is_resource($dbha->connection)) { - print "\$dbha is connected\n"; +switch ($dbh->phptype) { + case 'mysqli': + if (is_a($dbha, 'mysqli')) { + print "\$dbha is connected\n"; + } else { + print "\$dbha NOT connected\n"; + } + break; + default: + if (gettype($dbha) == 'resource') { + print "\$dbha is connected\n"; + } else { + print "\$dbha NOT connected\n"; + } } ?> http://cvs.php.net/diff.php/pear/DB/tests/driver/03simplequery.phpt?r1=1.5&r2=1.6&ty=u Index: pear/DB/tests/driver/03simplequery.phpt diff -u pear/DB/tests/driver/03simplequery.phpt:1.5 pear/DB/tests/driver/03simplequery.phpt:1.6 --- pear/DB/tests/driver/03simplequery.phpt:1.5 Mon Jan 12 23:56:02 2004 +++ pear/DB/tests/driver/03simplequery.phpt Thu Apr 29 00:24:44 2004 @@ -8,4 +8,4 @@ require_once '../simplequery.inc'; ?> --EXPECT-- -resource +passed