*** empty log message ***

diff --git a/ext/oci8/tests/field_funcs.phpt b/ext/oci8/tests/field_funcs.phpt
index 102f2fdc03829e412a40452ab1cf9825c8c8ca06..18143f6f1bc11cb7aa8f56027a831a438134b340 100644 (file)
--- a/ext/oci8/tests/field_funcs.phpt
+++ b/ext/oci8/tests/field_funcs.phpt
@@ -54,7 +54,7 @@ require dirname(__FILE__).'/drop_table.inc';
 echo "Done\n";
 
 ?>
---EXPECTF--
+--EXPECT--
 array(5) {
   [0]=>
   string(1) "1"
@@ -71,14 +71,14 @@ bool(false)
 string(2) "ID"
 string(6) "NUMBER"
 int(2)
-int(%d)
+int(-127)
 int(0)
 int(22)
 bool(false)
 string(5) "VALUE"
 string(6) "NUMBER"
 int(2)
-int(%d)
+int(-127)
 int(0)
 int(22)
 bool(true)

diff --git a/ext/oci8/tests/field_funcs2.phpt b/ext/oci8/tests/field_funcs2.phpt
new file mode 100644 (file)
index 0000000..9b8d3e5
--- /dev/null
+++ b/ext/oci8/tests/field_funcs2.phpt
@@ -0,0 +1,70 @@
+--TEST--
+Bug #41917 (invalid scale and precision)
+--SKIPIF--
+<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
+--FILE--
+<?php
+
+require dirname(__FILE__)."/connect.inc";
+require dirname(__FILE__).'/create_table.inc';
+
+$s = oci_parse($c, 'drop table b41917t');
+@oci_execute($s);
+
+$t = array("C01" => "NUMBER",
+                  "C02" => "NUMBER(*,1)",
+                  "C03" => "NUMBER(9)",
+                  "C04" => "NUMBER(9,2)",
+                  "C05" => "NUMBER(9,1)",
+                  "C06" => "NUMBER(7,-2)",
+                  "C07" => "DECIMAL(4,9)",
+                  "C08" => "NUMERIC(4,9)",
+                  "C09" => "DECIMAL(4)",
+                  "C10" => "INTEGER",
+                  "C11" => "INT",
+                  "C12" => "SMALLINT",
+                  "C13" => "FLOAT",
+                  "C14" => "FLOAT(9)",
+                  "C15" => "DOUBLE PRECISION",
+                  "C16" => "REAL",
+                  );
+
+$stmt = "create table b41917t (\n";
+foreach ($t as $colname => $type) {
+       $stmt .= "$colname $type,\n";
+}
+$stmt[strlen($stmt)-2] = ")";
+
+$s = oci_parse($c, $stmt);
+oci_execute($s);
+
+$s = oci_parse($c, "select * from b41917t");
+oci_execute($s);
+
+for ($i = 1; $i <= oci_num_fields($s); $i++) {
+       $name = oci_field_name($s, $i);
+       $precision = oci_field_precision($s, $i);
+       $scale = oci_field_scale($s, $i);
+       echo "$name ".$t[$name] .": precision $precision, scale $scale\n";
+}
+
+echo "Done\n";
+?>
+--EXPECT--
+C01 NUMBER: precision 0, scale -127
+C02 NUMBER(*,1): precision 38, scale 1
+C03 NUMBER(9): precision 9, scale 0
+C04 NUMBER(9,2): precision 9, scale 2
+C05 NUMBER(9,1): precision 9, scale 1
+C06 NUMBER(7,-2): precision 7, scale -2
+C07 DECIMAL(4,9): precision 4, scale 9
+C08 NUMERIC(4,9): precision 4, scale 9
+C09 DECIMAL(4): precision 4, scale 0
+C10 INTEGER: precision 38, scale 0
+C11 INT: precision 38, scale 0
+C12 SMALLINT: precision 38, scale 0
+C13 FLOAT: precision 126, scale -127
+C14 FLOAT(9): precision 9, scale -127
+C15 DOUBLE PRECISION: precision 126, scale -127
+C16 REAL: precision 63, scale -127
+Done
\ No newline at end of file

diff --git a/ext/oci8/tests/field_funcs_old.phpt b/ext/oci8/tests/field_funcs_old.phpt
index e6f21d613d091832da99111496103938b5912521..e0d24cd7b7cb14bc2fda3f2c07c1a643f2aeaba3 100644 (file)
--- a/ext/oci8/tests/field_funcs_old.phpt
+++ b/ext/oci8/tests/field_funcs_old.phpt
@@ -54,7 +54,7 @@ require dirname(__FILE__).'/drop_table.inc';
 echo "Done\n";
 
 ?>
---EXPECTF--
+--EXPECT--
 array(5) {
   [0]=>
   string(1) "1"
@@ -71,14 +71,14 @@ bool(false)
 string(2) "ID"
 string(6) "NUMBER"
 int(2)
-int(%d)
+int(-127)
 int(0)
 int(22)
 bool(false)
 string(5) "VALUE"
 string(6) "NUMBER"
 int(2)
-int(%d)
+int(-127)
 int(0)
 int(22)
 bool(true)