Fixed numeric/decimal +/-(x,y) +/-(x,0)

for all platforms

diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c
index d77a126478f6d9de2ff3467f3df866281c8fa304..90a95ed90ee7566dd4709bc48ee2b6331004c177 100644 (file)
--- a/ext/interbase/interbase.c
+++ b/ext/interbase/interbase.c
@@ -1781,25 +1781,36 @@ static int _php_ibase_var_zval(zval *val, void *data, int type, int len, int sca
                        Z_STRLEN_P(val) = len;
                        break;
                case SQL_LONG:
+               case SQL_SHORT:
                        if (scale) {
-                               int j, f = 1;
-                               float n = (float) *(long *) (data);
-                               
+                               short j;
+                               long n, f = 1;
+                               if ( (type & ~1) == SQL_SHORT) {
+                                       n = (long) *(short *) (data);
+                               }else { 
+                                       n = (long) *(long *) (data);
+                               }
                                for (j = 0; j < -scale; j++) {
                                        f *= 10;
                                }
+                               if (n  >= 0){
+                                       Z_STRLEN_P(val) = sprintf (string_data, "%ld.%0*ld", n / f, -scale,  n % f );
+                               }else if ((n/f) != 0 ){
+                                       Z_STRLEN_P(val) = sprintf (string_data, "%ld.%0*ld", n / f, -scale,  -(n % f) );
+                               }else{
+                                       Z_STRLEN_P(val) = sprintf (string_data, "%s.%0*ld","-0", -scale, -(n % f) );
+                               }
                                Z_TYPE_P(val) = IS_STRING;
-                               Z_STRLEN_P(val) = sprintf(string_data, "%.*f", -scale, n / f);
                                Z_STRVAL_P(val) = estrdup(string_data);
                        } else {
                                Z_TYPE_P(val) = IS_LONG;
-                               Z_LVAL_P(val) = *(long *) (data);
+                               if ( (type & ~1) == SQL_SHORT) {
+                                       Z_LVAL_P(val) = *(short *) (data);
+                               }else{
+                                       Z_LVAL_P(val) = *(long *) (data);
+                               }
                        }
                        break;
-               case SQL_SHORT:
-                       Z_TYPE_P(val) = IS_LONG;
-                       Z_LVAL_P(val) = *(short *) (data);
-                       break;
                case SQL_FLOAT:
                        Z_TYPE_P(val) = IS_DOUBLE;
                        Z_DVAL_P(val) = *(float *) (data);
@@ -1817,16 +1828,23 @@ static int _php_ibase_var_zval(zval *val, void *data, int type, int len, int sca
 #ifdef SQL_INT64
                case SQL_INT64:
                        Z_TYPE_P(val) = IS_STRING;
-
-                       if (scale) {
-                               int j, f = 1;
-                               double number = (double) ((ISC_INT64) (*((ISC_INT64 *) data)));
-                               char dt[20];
+                       if (scale < 0 ){
+                               short j = 0;
+                               ISC_INT64 n, f = 1;
+                               n = (ISC_INT64) *(ISC_INT64 *) data;
                                for (j = 0; j < -scale; j++) {
                                        f *= 10;
                                }
-                               sprintf(dt, "%%0.%df", -scale);
-                               Z_STRLEN_P(val) = sprintf (string_data, dt, number / f);
+                               if ( n >= 0){
+                               Z_STRLEN_P(val) = sprintf (string_data, "%" ISC_INT64_FORMAT "d.%0*" ISC_INT64_FORMAT "d",
+                                                                                       (ISC_INT64) n / f, -scale, (ISC_INT64) n % f );
+                               }else if ((n/f) != 0 ){
+                               Z_STRLEN_P(val) = sprintf (string_data, "%" ISC_INT64_FORMAT "d.%0*" ISC_INT64_FORMAT "d",
+                                                                                       (ISC_INT64) n / f, -scale, (ISC_INT64) -(n % f) );
+                               }else{
+                               Z_STRLEN_P(val) = sprintf (string_data, "%s.%0*" ISC_INT64_FORMAT "d",
+                                                                                       "-0", -scale, (ISC_INT64) -(n % f) );
+                               }
                        } else {
                                Z_STRLEN_P(val) =sprintf (string_data, "%.0" ISC_INT64_FORMAT "d",
                                                                                            (ISC_INT64) *(ISC_INT64 *) data);

diff --git a/ext/interbase/tests/003.phpt b/ext/interbase/tests/003.phpt
index dbd1cec92b6f55f0a9856310bad58397a9e6b20e..341be8e31060fe618c3db00bbce01a0c0d59aec6 100644 (file)
--- a/ext/interbase/tests/003.phpt
+++ b/ext/interbase/tests/003.phpt
@@ -8,7 +8,6 @@ InterBase: misc sql types (may take a while)
 <?php
 
     require("interbase.inc");
-    
     ibase_connect($test_base);
     
     ibase_query(
@@ -16,11 +15,15 @@ InterBase: misc sql types (may take a while)
             iter               integer,
             v_char             char(1000),
             v_date      timestamp,
-            v_decimal   decimal(12,3),
+                       v_decimal4_2            decimal(4,2),
+                       v_decimal4_0            decimal(4,0),
+                       v_decimal7_2            decimal(7,2),
+                       v_decimal7_0            decimal(7,0),
+                       v_numeric15_15          numeric(15,15),
+                       v_numeric15_0   numeric(15,0),
             v_double   double precision,
             v_float     float,
                v_integer   integer,
-               v_numeric   numeric(4,2),
             v_smallint  smallint,
             v_varchar   varchar(10000)
             )");
@@ -33,18 +36,21 @@ InterBase: misc sql types (may take a while)
        /* prepare data  */
        $v_char = rand_str(1000);
        $v_date = rand_datetime();
-       $v_decimal = rand_number(12,3);
+       $v_decimal4_2 = rand_number(4,2);
+       $v_decimal4_0 = rand_number(4,0);
+       $v_decimal7_2 = rand_number(7,2); 
+       $v_decimal7_0 = rand_number(7,0);
+       $v_numeric15_15 = rand_number(15,15);
+       $v_numeric15_0 = rand_number(15,0);
        $v_double  = rand_number(18);
        $v_float   = rand_number(7);
        $v_integer = rand_number(9,0);
-       $v_numeric = rand_number(4,2);
        $v_smallint = rand_number(5) % 32767;
        $v_varchar = rand_str(10000);
 
        ibase_query(
-       "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");
+       "insert into test3 (iter, v_char,v_date,v_decimal4_2, v_decimal4_0, v_decimal7_2, v_decimal7_0,v_numeric15_15, v_numeric15_0,v_double,v_float,v_integer,v_smallint,v_varchar)
+       values ($iter, '$v_char','$v_date',$v_decimal4_2, $v_decimal4_0, $v_decimal7_2, $v_decimal7_0,$v_numeric15_15, $v_numeric15_0,$v_double,$v_float,$v_integer,$v_smallint,'$v_varchar')");
        $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){
@@ -57,11 +63,37 @@ InterBase: misc sql types (may take a while)
             echo " in:  $v_date\n";
             echo " out: $row->V_DATE\n";
         }
-        if($row->V_DECIMAL != $v_decimal){
-            echo " DECIMAL fail\n";
-            echo " in:  $v_decimal\n";
-            echo " out: $row->V_DECIMAL\n";
+        if($row->V_DECIMAL4_2 != $v_decimal4_2){
+            echo " DECIMAL4_2 fail\n";
+            echo " in:  $v_decimal4_2\n";
+            echo " out: $row->V_DECIMAL4_2\n";
+        }
+        if($row->V_DECIMAL4_0 != $v_decimal4_0){
+            echo " DECIMAL4_0 fail\n";
+            echo " in:  $v_decimal4_0\n";
+            echo " out: $row->V_DECIMAL4_0\n";
+        }
+        if($row->V_DECIMAL7_2 != $v_decimal7_2){
+            echo " DECIMAL7_2 fail\n";
+            echo " in:  $v_decimal7_2\n";
+            echo " out: $row->V_DECIMAL7_2\n";
+        }
+        if($row->V_DECIMAL7_0 != $v_decimal7_0){
+            echo " DECIMAL7_0 fail\n";
+            echo " in:  $v_decimal7_0\n";
+            echo " out: $row->V_DECIMAL7_0\n";
         }
+        if($row->V_NUMERIC15_15 != $v_numeric15_15){
+            echo " NUMERIC15_15 fail\n";
+            echo " in:  $v_numeric15_15\n";
+            echo " out: $row->V_NUMERIC15_15\n";
+        }
+        if($row->V_NUMERIC15_0 != $v_numeric15_0){
+            echo " NUMERIC15_0 fail\n";
+            echo " in:  $v_numeric15_0\n";
+            echo " out: $row->V_NUMERIC15_0\n";
+        }
+        
         if(abs($row->V_DOUBLE - $v_double) > abs($v_double / 1E15)){
             echo " DOUBLE fail\n";
             echo " in:  $v_double\n";
@@ -77,6 +109,18 @@ InterBase: misc sql types (may take a while)
             echo " in:  $v_integer\n";
             echo " out: $row->V_INTEGER\n";
         }
+        if($row->V_SMALLINT != $v_smallint){
+            echo " SMALLINT fail\n";
+            echo " in:  $v_smallint\n";
+            echo " out: $row->V_SMALLINT\n";
+        }
+        
+                 if(substr($row->V_VARCHAR,0,strlen($v_varchar)) != $v_varchar){
+               echo " VARCHAR fail:\n";
+            echo " in:  $v_varchar\n";
+            echo " out: $row->V_VARCHAR\n";
+        }
+      
         ibase_free_result($sel);
     } /* for($iter) */