cvs: pear /DB/tests/driver 16tableinfo.phpt

danielc Thu Jan 22 03:04:34 2004 EDT Modified files: /pear/DB/tests/driver 16tableinfo.phpt Log: Tweak NULL in CREATE TABLE to make ibase and ifx happy. Remove 'JOIN' from SELECT to make ifx 7.2 work. http://cvs.php.net/diff.php/pear/DB/tests/driver/16tableinfo.phpt?r1=1.6&r2=1.7&ty=u Index: pear/DB/tests/driver/16tableinfo.phpt diff -u pear/DB/tests/driver/16tableinfo.phpt:1.6 pear/DB/tests/driver/16tableinfo.phpt:1.7 --- pear/DB/tests/driver/16tableinfo.phpt:1.6 Tue Jan 20 01:48:56 2004 +++ pear/DB/tests/driver/16tableinfo.phpt Thu Jan 22 03:04:33 2004 @@ -35,7 +35,7 @@ * @see DB_common::tableInfo() * * @package DB - * @version $Id: 16tableinfo.phpt,v 1.6 2004/01/20 06:48:56 danielc Exp $ + * @version $Id: 16tableinfo.phpt,v 1.7 2004/01/22 08:04:33 danielc Exp $ * @category Database * @author Daniel Convissor <danielc@analysisandsolutions.com> * @internal @@ -52,7 +52,7 @@ --FILE-- <?php -// $Id: 16tableinfo.phpt,v 1.6 2004/01/20 06:48:56 danielc Exp $ +// $Id: 16tableinfo.phpt,v 1.7 2004/01/22 08:04:33 danielc Exp $ /** * Connect to the database and make the phptest table. @@ -447,14 +447,16 @@ $dbh->setErrorHandling(PEAR_ERROR_CALLBACK, 'pe'); +// $null is set in mktable.inc + $dbh->query(" CREATE TABLE phptest_fk ( a INTEGER NOT NULL, fk INTEGER NOT NULL, - c {$quirks[$dbh->phptype]['clob']} NULL, + c {$quirks[$dbh->phptype]['clob']} $null, d {$quirks[$dbh->phptype]['date']} NOT NULL, e CHAR(4) DEFAULT 'df t' NOT NULL, - f DECIMAL(2,1) NULL, + f DECIMAL(2,1) $null, PRIMARY KEY (fk), UNIQUE (a, d) ) @@ -465,8 +467,8 @@ $dbh->query("INSERT INTO phptest_fk VALUES (30, 3, 'Three', '2001-02-14', 'c3', 3.3)"); -$resultobj =& $dbh->query('SELECT * FROM phptest_fk ' . - 'JOIN phptest on phptest.a = phptest_fk.fk'); +$resultobj =& $dbh->query('SELECT * FROM phptest_fk, ' . + 'phptest WHERE phptest.a = phptest_fk.fk');