Merge branch 'master' into ibase_result

Author: mlazdans

tests/ibase_param_info_004.phpt

@@ -0,0 +1,67 @@
+--TEST--
+ibase_param_info(): Basic test with ibase_query()
+--SKIPIF--
+<?php include("skipif.inc"); ?>
+--FILE--
+<?php
+
+require("interbase.inc");
+
+(function($test_base){
+	ibase_connect($test_base);
+
+	$rs = ibase_query('SELECT * FROM TEST1 WHERE 1 = ? OR 2 = ?', 1, 2);
+	$count = ibase_num_params($rs);
+	var_dump($count);
+	for($i = 0; $i < $count; $i++){
+		var_dump(ibase_field_info($rs, $i));
+	}
+})($test_base);
+
+?>
+--EXPECTF--
+int(2)
+array(10) {
+  [0]=>
+  string(1) "I"
+  ["name"]=>
+  string(1) "I"
+  [1]=>
+  string(1) "I"
+  ["alias"]=>
+  string(1) "I"
+  [2]=>
+  string(5) "TEST1"
+  ["relation"]=>
+  string(5) "TEST1"
+  [3]=>
+  string(1) "4"
+  ["length"]=>
+  string(1) "4"
+  [4]=>
+  string(7) "INTEGER"
+  ["type"]=>
+  string(7) "INTEGER"
+}
+array(10) {
+  [0]=>
+  string(1) "C"
+  ["name"]=>
+  string(1) "C"
+  [1]=>
+  string(1) "C"
+  ["alias"]=>
+  string(1) "C"
+  [2]=>
+  string(5) "TEST1"
+  ["relation"]=>
+  string(5) "TEST1"
+  [3]=>
+  string(3) "100"
+  ["length"]=>
+  string(3) "100"
+  [4]=>
+  string(7) "VARCHAR"
+  ["type"]=>
+  string(7) "VARCHAR"
+}

tests/proc-001.phpt

@@ -0,0 +1,111 @@
+--TEST--
+Procedures
+--SKIPIF--
+<?php include("skipif.inc"); ?>
+--FILE--
+<?php
+
+require("interbase.inc");
+
+(function(){
+	ibase_query(
+	"CREATE OR ALTER PROCEDURE GET_5_RECORDS(ARG INTEGER)
+	RETURNS (N INTEGER, RESULT INTEGER)
+	AS
+	DECLARE VARIABLE I INTEGER;
+	BEGIN
+		:I = 1;
+		WHILE (:I <= 5) DO BEGIN
+			:N = :I;
+			:RESULT = :ARG + :I;
+			:I =:I + 1;
+			SUSPEND;
+		END
+	END");
+
+	$query = ibase_prepare("EXECUTE PROCEDURE GET_5_RECORDS(?)");
+	dump_rows(ibase_execute($query, 1));
+	dump_rows(ibase_execute($query, 10));
+
+	print "------------------\n";
+
+	$query = ibase_prepare("SELECT * FROM GET_5_RECORDS(?)");
+	dump_rows(ibase_execute($query, 1));
+	dump_rows(ibase_execute($query, 10));
+})();
+
+?>
+--EXPECT--
+array(2) {
+  ["N"]=>
+  int(1)
+  ["RESULT"]=>
+  int(2)
+}
+array(2) {
+  ["N"]=>
+  int(1)
+  ["RESULT"]=>
+  int(11)
+}
+------------------
+array(2) {
+  ["N"]=>
+  int(1)
+  ["RESULT"]=>
+  int(2)
+}
+array(2) {
+  ["N"]=>
+  int(2)
+  ["RESULT"]=>
+  int(3)
+}
+array(2) {
+  ["N"]=>
+  int(3)
+  ["RESULT"]=>
+  int(4)
+}
+array(2) {
+  ["N"]=>
+  int(4)
+  ["RESULT"]=>
+  int(5)
+}
+array(2) {
+  ["N"]=>
+  int(5)
+  ["RESULT"]=>
+  int(6)
+}
+array(2) {
+  ["N"]=>
+  int(1)
+  ["RESULT"]=>
+  int(11)
+}
+array(2) {
+  ["N"]=>
+  int(2)
+  ["RESULT"]=>
+  int(12)
+}
+array(2) {
+  ["N"]=>
+  int(3)
+  ["RESULT"]=>
+  int(13)
+}
+array(2) {
+  ["N"]=>
+  int(4)
+  ["RESULT"]=>
+  int(14)
+}
+array(2) {
+  ["N"]=>
+  int(5)
+  ["RESULT"]=>
+  int(15)
+}