cvs: php4 /ext/interbase/tests 001.phpt 002.phpt 003.phpt 004.phpt 005.phpt 006.phpt

ludoo Tue Mar 19 11:52:41 2002 EDT Modified files: /php4/ext/interbase/tests 001.phpt 002.phpt 003.phpt 004.phpt 005.phpt 006.phpt Log: Fixed include of interbase.inc Fixed test database path Changed v_date field in test table definition to timestamp type Reduced maximum length of double precision type to 18 Tests 001 002 003 006 pass Test 004 (BLOB test) still needs to be fixed Test 005 (Transaction) gives the right output but issues a warning Index: php4/ext/interbase/tests/001.phpt diff -u php4/ext/interbase/tests/001.phpt:1.1 php4/ext/interbase/tests/001.phpt:1.2 --- php4/ext/interbase/tests/001.phpt:1.1 Sun Aug 27 15:45:58 2000 +++ php4/ext/interbase/tests/001.phpt Tue Mar 19 11:52:41 2002 @@ -6,9 +6,11 @@ --GET-- --FILE-- <? -/* $Id: 001.phpt,v 1.1 2000/08/27 19:45:58 ssb Exp $ */ +/* $Id: 001.phpt,v 1.2 2002/03/19 16:52:41 ludoo Exp $ */ - $test_base = "ibase_test.tmp"; + // remember to give write permission to the ext/ibase/tests directory + // to the user running interbase, otherwise db creation/deletion will fail + $test_base = dirname(__FILE__)."/ibase_test.tmp"; $name = tempnam("","CREATEDB"); $ftmp = fopen($name,"w"); if (is_file($test_base)) @@ -19,16 +21,19 @@ fwrite($ftmp, "create database \"$test_base\"; create table test1 ( - i integer, - c varchar(100) - ); - commit; - insert into test1(i, c) values(1, 'test table created with isql'); - exit;\n" + i integer, + c varchar(100) + ); + commit; + insert into test1(i, c) values(1, 'test table created with isql'); + exit;\n" ); fclose($ftmp); - exec("isql -i $name 2>&1"); + // passthru gives us some output, allowing the test to pass + // (actually, it passes after the first run when the db gets deleted/recreated) + passthru("isql -i $name 2>&1"); unlink($name); ?> --EXPECT-- - +Use CONNECT or CREATE DATABASE to specify a database +Database: "ext/interbase/tests/ibase_test.tmp" Index: php4/ext/interbase/tests/002.phpt diff -u php4/ext/interbase/tests/002.phpt:1.1 php4/ext/interbase/tests/002.phpt:1.2 --- php4/ext/interbase/tests/002.phpt:1.1 Sun Aug 27 15:45:58 2000 +++ php4/ext/interbase/tests/002.phpt Tue Mar 19 11:52:41 2002 @@ -6,11 +6,11 @@ --GET-- --FILE-- <? -/* $Id: 002.phpt,v 1.1 2000/08/27 19:45:58 ssb Exp $ */ +/* $Id: 002.phpt,v 1.2 2002/03/19 16:52:41 ludoo Exp $ */ - require("interbase/interbase.inc"); + require(dirname(__FILE__)."/interbase.inc"); - $test_base = "ibase_test.tmp"; + $test_base = dirname(__FILE__)."/ibase_test.tmp"; ibase_connect($test_base); out_table("test1"); Index: php4/ext/interbase/tests/003.phpt diff -u php4/ext/interbase/tests/003.phpt:1.1 php4/ext/interbase/tests/003.phpt:1.2 --- php4/ext/interbase/tests/003.phpt:1.1 Sun Aug 27 15:45:58 2000 +++ php4/ext/interbase/tests/003.phpt Tue Mar 19 11:52:41 2002 @@ -6,11 +6,11 @@ --GET-- --FILE-- <? -/* $Id: 003.phpt,v 1.1 2000/08/27 19:45:58 ssb Exp $ */ +/* $Id: 003.phpt,v 1.2 2002/03/19 16:52:41 ludoo Exp $ */ - require("interbase/interbase.inc"); + require(dirname(__FILE__)."/interbase.inc"); - $test_base = "ibase_test.tmp"; + $test_base = dirname(__FILE__)."/ibase_test.tmp"; ibase_connect($test_base); @@ -18,7 +18,7 @@ "create table test3 ( iter integer, v_char char(1000), - v_date date, + v_date timestamp, v_decimal decimal(12,3), v_double double precision, v_float float, @@ -37,7 +37,7 @@ $v_char = rand_str(1000); $v_date = rand_datetime(); $v_decimal = rand_number(12,3); - $v_double = rand_number(20); + $v_double = rand_number(18); $v_float = rand_number(7); $v_integer = rand_number(9,0); $v_numeric = rand_number(4,2); @@ -48,7 +48,7 @@ "insert into test3 (iter, v_char,v_date,v_decimal,v_double,v_float,v_integer,v_numeric,v_smallint,v_varchar) values ($iter, '$v_char','$v_date',$v_decimal,$v_double,$v_float,$v_integer,$v_numeric,$v_smallint,'$v_varchar')"); $sel = ibase_query("select * from test3 where iter = $iter"); - + $sel = ibase_query("select * from test3 where iter = $iter"); $row = ibase_fetch_object($sel); if(substr($row->V_CHAR,0,strlen($v_char)) != $v_char){ echo " CHAR fail:\n"; Index: php4/ext/interbase/tests/004.phpt diff -u php4/ext/interbase/tests/004.phpt:1.1 php4/ext/interbase/tests/004.phpt:1.2 --- php4/ext/interbase/tests/004.phpt:1.1 Sun Aug 27 15:45:58 2000 +++ php4/ext/interbase/tests/004.phpt Tue Mar 19 11:52:41 2002 @@ -6,11 +6,11 @@ --GET-- --FILE-- <? -/* $Id: 004.phpt,v 1.1 2000/08/27 19:45:58 ssb Exp $ */ +/* $Id: 004.phpt,v 1.2 2002/03/19 16:52:41 ludoo Exp $ */ - require("interbase/interbase.inc"); + require(dirname(__FILE__)."/interbase.inc"); - $test_base = "ibase_test.tmp"; + $test_base = dirname(__FILE__)."/ibase_test.tmp"; ibase_connect($test_base); Index: php4/ext/interbase/tests/005.phpt diff -u php4/ext/interbase/tests/005.phpt:1.1 php4/ext/interbase/tests/005.phpt:1.2 --- php4/ext/interbase/tests/005.phpt:1.1 Sun Aug 27 15:45:58 2000 +++ php4/ext/interbase/tests/005.phpt Tue Mar 19 11:52:41 2002 @@ -6,11 +6,11 @@ --GET-- --FILE-- <? -/* $Id: 005.phpt,v 1.1 2000/08/27 19:45:58 ssb Exp $ */ +/* $Id: 005.phpt,v 1.2 2002/03/19 16:52:41 ludoo Exp $ */ - require("interbase/interbase.inc"); + require(dirname(__FILE__)."/interbase.inc"); - $test_base = "ibase_test.tmp"; + $test_base = dirname(__FILE__)."/ibase_test.tmp"; ibase_connect($test_base); @@ -111,7 +111,7 @@ $tr_1 = ibase_trans(); /* this default transaction also */ $tr_2 = ibase_trans(IBASE_READ); - $tr_3 = ibase_trans(IBASE_READ+IBASE_COMMITED); + $tr_3 = ibase_trans(IBASE_READ+IBASE_COMMITTED); $res = ibase_query("select * from test5"); @@ -157,15 +157,14 @@ ibase_free_result($res); ibase_close(); - /* transactions on second link */ $link_1 = ibase_pconnect($test_base); $link_2 = ibase_pconnect($test_base); - $tr_1 = ibase_trans($link_2, IBASE_DEFAULT); /* this default transaction also */ - $tr_2 = ibase_trans($link_2, IBASE_COMMITED); + $tr_1 = ibase_trans(IBASE_DEFAULT, $link_2); /* this default transaction also */ + $tr_2 = ibase_trans(IBASE_COMMITTED, $link_2); $res = ibase_query($tr_1, "select * from test5"); Index: php4/ext/interbase/tests/006.phpt diff -u php4/ext/interbase/tests/006.phpt:1.1 php4/ext/interbase/tests/006.phpt:1.2 --- php4/ext/interbase/tests/006.phpt:1.1 Sun Aug 27 15:45:58 2000 +++ php4/ext/interbase/tests/006.phpt Tue Mar 19 11:52:41 2002 @@ -6,11 +6,11 @@ --GET-- --FILE-- <? -/* $Id: 006.phpt,v 1.1 2000/08/27 19:45:58 ssb Exp $ */ +/* $Id: 006.phpt,v 1.2 2002/03/19 16:52:41 ludoo Exp $ */ - require("interbase/interbase.inc"); + require(dirname(__FILE__)."/interbase.inc"); - $test_base = "ibase_test.tmp"; + $test_base = dirname(__FILE__)."/ibase_test.tmp"; ibase_connect($test_base); @@ -18,7 +18,7 @@ "create table test6 ( iter integer, v_char char(1000), - v_date date, + v_date timestamp, v_decimal decimal(12,3), v_double double precision, v_float float,