Added event handling test

CS

2 files changed, 63 insertions, 12 deletions

diff --git a/ext/interbase/tests/004.phpt b/ext/interbase/tests/004.phpt
index c69524f131..53f5319301 100644
--- a/ext/interbase/tests/004.phpt
+++ b/ext/interbase/tests/004.phpt
@@ -9,10 +9,10 @@ InterBase: BLOB test
 
     require("interbase.inc");
     
-    ibase_connect($test_base);
+    $link = ibase_connect($test_base);
 
     ibase_query(
-    	"create table test4 (
+    	"CREATE TABLE test4 (
     		v_integer   integer,
             v_blob		blob)");
     ibase_commit();
@@ -28,10 +28,14 @@ InterBase: BLOB test
     echo "import blob 1\n";
     $ftmp = fopen($name,"r");
     $bl_s = ibase_blob_import($ftmp);
-    ibase_query("insert into test4 (v_integer, v_blob) values (1, ?)", $bl_s);
+    ibase_query("INSERT INTO test4 (v_integer, v_blob) VALUES (1, ?)", $bl_s);
+
+    $bl_s = ibase_blob_import($ftmp,$link);
+    ibase_query($link, "INSERT INTO test4 (v_integer, v_blob) VALUES (1, ?)", $bl_s);
 
     echo "test blob 1\n";
-    $q = ibase_query("select v_blob from test4 where v_integer = 1");
+    $q = ibase_query("SELECT v_blob FROM test4 WHERE v_integer = 1");
+
     $row = ibase_fetch_object($q);
     $bl_h = ibase_blob_open($row->V_BLOB);
 
@@ -42,7 +46,7 @@ InterBase: BLOB test
 		echo " BLOB 1 fail (1)\n";
     ibase_blob_close($bl_h);
 
-    $bl_h = ibase_blob_open($row->V_BLOB);
+    $bl_h = ibase_blob_open($row->V_BLOB,$link);
 
 	$blob = '';    
     while($piece = ibase_blob_get($bl_h, 100 * 1024))
@@ -55,11 +59,11 @@ InterBase: BLOB test
 
     echo "create blob 2\n";
 
-    ibase_query("insert into test4 (v_integer, v_blob) values (2, ?)", $blob_str);
+    ibase_query("INSERT INTO test4 (v_integer, v_blob) VALUES (2, ?)", $blob_str);
 
     echo "test blob 2\n";
 
-    $q = ibase_query("select v_blob from test4 where v_integer = 2");
+    $q = ibase_query("SELECT v_blob FROM test4 WHERE v_integer = 2");
     $row = ibase_fetch_object($q,IBASE_TEXT);
 
     if($row->V_BLOB != $blob_str)
@@ -70,7 +74,7 @@ InterBase: BLOB test
 
     echo "create blob 3\n";
 
-    $bl_h = ibase_blob_create();
+    $bl_h = ibase_blob_create($link);
 
     ibase_blob_add($bl_h, "+----------------------------------------------------------------------+\n");
     ibase_blob_add($bl_h, "| PHP HTML Embedded Scripting Language Version 3.0                     |\n");
@@ -97,21 +101,21 @@ InterBase: BLOB test
     ibase_blob_add($bl_h, "| contact core@php.net.                                                |\n");
     ibase_blob_add($bl_h, "+----------------------------------------------------------------------+\n");
     $bl_s = ibase_blob_close($bl_h);
-    ibase_query("insert into test4 (v_integer, v_blob) values (3, ?)", $bl_s);
+    ibase_query("INSERT INTO test4 (v_integer, v_blob) VALUES (3, ?)", $bl_s);
 	ibase_commit();
     echo "echo blob 3\n";
 
-    $q = ibase_query("select v_blob from test4 where v_integer = 3");
+    $q = ibase_query("SELECT v_blob FROM test4 WHERE v_integer = 3");
     $row = ibase_fetch_object($q);
 	ibase_commit();
 	ibase_close();
 	    
     ibase_connect($test_base);
-    ibase_blob_echo($row->V_BLOB);
+    ibase_blob_echo($row->V_BLOB, $link);
     ibase_free_result($q);
 
     echo "fetch blob 3\n";
-    $q = ibase_query("select v_blob from test4 where v_integer = 3");
+    $q = ibase_query("SELECT v_blob FROM test4 WHERE v_integer = 3");
     $row = ibase_fetch_object($q,IBASE_TEXT);
     echo $row->V_BLOB;
     ibase_free_result($q);
diff --git a/ext/interbase/tests/008.phpt b/ext/interbase/tests/008.phpt
new file mode 100755
index 0000000000..11072369e8
--- /dev/null
+++ b/ext/interbase/tests/008.phpt
@@ -0,0 +1,47 @@
+--TEST--
+InterBase: event handling
+--SKIPIF--
+<?php include("skipif.inc"); ?>
+--POST--
+--GET--
+--FILE--
+<?php /* $Id$ */
+
+require("interbase.inc");
+
+$count = 0;
+
+function event_callback($event)
+{
+	global $count;
+	if ($event == 'TEST1') echo "FAIL TEST1\n";
+	return (++$count < 5); /* cancel event */
+}
+
+$link = ibase_connect($test_base);
+
+ibase_query("CREATE PROCEDURE pevent AS BEGIN POST_EVENT 'TEST1'; POST_EVENT 'TEST2'; END");
+ibase_commit();
+
+$e = ibase_set_event_handler('event_callback','TEST1');
+ibase_free_event_handler($e);
+
+ibase_set_event_handler('event_callback','TEST2');
+
+usleep(5E+5);
+
+for ($i = 0; $i < 8; ++$i) {
+	ibase_query("EXECUTE PROCEDURE pevent");
+	ibase_commit();
+
+	usleep(3E+5);
+}
+
+usleep(5E+5);
+
+if (!$count || $count > 5) echo "FAIL ($count)\n";
+echo "end of test\n";
+
+?>
+--EXPECT--
+end of test