Merge pull request #663 from aguibert/decimal-precision

Decimal precision fix

Author: aguibert

vertx-db2-client/src/main/java/io/vertx/db2client/impl/drda/DRDAQueryRequest.java

@@ -16,6 +16,8 @@
 package io.vertx.db2client.impl.drda;
 
 import java.math.BigDecimal;
+import java.math.MathContext;
+import java.math.RoundingMode;
 import java.sql.ResultSet;
 import java.sql.RowId;
 import java.sql.Types;
@@ -27,6 +29,7 @@
 import java.util.Hashtable;
 
 import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufUtil;
 
 public class DRDAQueryRequest extends DRDAConnectRequest {
 
@@ -919,7 +922,7 @@ private void buildSQLDTA(int numColumns,
         }
 
         buildSQLDTAGRP(numColumns, lidAndLengthOverrides, overrideExists, overrideMap);
-
+        
         if (overrideExists) {
             buffer.writeBytes(FdocaConstants.MDD_SQLDTA_TOSEND);
         }
@@ -942,25 +945,28 @@ private void buildSQLDTAGRP(int numVars,
                                   Hashtable overrideMap) {
         int n = 0;
         int offset = 0;
+        
 
         n = calculateColumnsInSQLDTAGRPtriplet(numVars);
         buildTripletHeader(((3 * n) + 3),
                 FdocaConstants.NGDA_TRIPLET_TYPE,
                 FdocaConstants.SQLDTAGRP_LID);
+        
 
         do {
             writeLidAndLengths(lidAndLengthOverrides, n, offset, mddRequired, overrideMap);
             numVars -= n;
             if (numVars == 0) {
                 break;
             }
-
+            
             offset += n;
             n = calculateColumnsInSQLDTAGRPtriplet(numVars);
             buildTripletHeader(((3 * n) + 3),
                     FdocaConstants.CPT_TRIPLET_TYPE,
                     0x00);
         } while (true);
+        
     }
 
     private int calculateColumnsInSQLDTAGRPtriplet(int numVars) {
@@ -1123,17 +1129,21 @@ private Hashtable computeProtocolTypesAndLengths(
                     }
                     else
                     {
-                        // adjust scale if it is negative. Packed Decimal cannot handle 
-                        // negative scale. We don't want to change the original 
-                        // object so make a new one.
-                        if (bigDecimal.scale() < 0) 
-                        {
+                        if (bigDecimal.scale() < 0)  {
                             bigDecimal =  bigDecimal.setScale(0);
                             inputRow[i] = bigDecimal;
-                        }                        
+                        }
+                        if (bigDecimal.precision() > parameterMetaData.sqlPrecision_[i]) {
+                            bigDecimal = bigDecimal.round(new MathContext(parameterMetaData.sqlPrecision_[i]));
+                            inputRow[i] = bigDecimal;
+                        }
+                        if (bigDecimal.scale() > parameterMetaData.sqlScale_[i]) {
+                            bigDecimal = bigDecimal.setScale(parameterMetaData.sqlScale_[i], RoundingMode.HALF_UP);
+                            inputRow[i] = bigDecimal;
+                        }
                         scale = bigDecimal.scale();
-                        precision = Decimal.computeBigDecimalPrecision(bigDecimal);
-                    }                    
+                        precision = bigDecimal.precision();
+                    }
                     lidAndLengths[i][0] = DRDAConstants.DRDA_TYPE_NDECIMAL;
                     lidAndLengths[i][1] = (precision << 8) + // use precision above
                         (scale << 0);
@@ -1399,7 +1409,7 @@ private Hashtable computeProtocolTypesAndLengths(
                     lidAndLengths[i][0]--;
                 }
             }
-            return overrideMap;
+            return overrideMap; // @AGG this is never used
 //        }
 //        catch ( SQLException se )
 //        {

vertx-db2-client/src/main/java/io/vertx/db2client/impl/drda/NetSqlca.java

@@ -123,25 +123,31 @@ public static void throwSqlError(NetSqlca sqlca) {
 	   switch(sqlca.sqlCode_) {
             // The SQL syntax is invalid
   	        case SqlCode.INVALID_SQL_STATEMENT:
-       	        throw new DB2Exception("The SQL syntax provided was invalid", SqlCode.INVALID_SQL_STATEMENT, sqlca.sqlState_);
+       	        throw new DB2Exception("The SQL syntax provided was invalid", sqlca.sqlCode_, sqlca.sqlState_);
        	    // The object (table?) is not defined/available
   	        case SqlCode.OBJECT_NOT_DEFINED:
   	        	if (sqlErrmc.length() > 0)
-  	        		throw new DB2Exception("The object '" + sqlErrmc + "' provided is not defined", SqlCode.OBJECT_NOT_DEFINED, sqlca.sqlState_);
+  	        		throw new DB2Exception("The object '" + sqlErrmc + "' provided is not defined", sqlca.sqlCode_, sqlca.sqlState_);
   	        	else
-  	        		throw new DB2Exception("An object provided is not defined", SqlCode.OBJECT_NOT_DEFINED, sqlca.sqlState_);
+  	        		throw new DB2Exception("An object provided is not defined", sqlca.sqlCode_, sqlca.sqlState_);
        	    // The object (table?) is not defined/available
   	        case SqlCode.COLUMN_DOES_NOT_EXIST:
   	        	if (sqlErrmc.length() > 0)
-  	        		throw new DB2Exception("The column '" + sqlErrmc + "' provided does not exist", SqlCode.COLUMN_DOES_NOT_EXIST, sqlca.sqlState_);
+  	        		throw new DB2Exception("The column '" + sqlErrmc + "' provided does not exist", sqlca.sqlCode_, sqlca.sqlState_);
   	        	else
-  	        		throw new DB2Exception("A column provided does not exist", SqlCode.COLUMN_DOES_NOT_EXIST, sqlca.sqlState_);
+  	        		throw new DB2Exception("A column provided does not exist", sqlca.sqlCode_, sqlca.sqlState_);
 	        // Invalid database specified
 	   	    case SqlCode.DATABASE_NOT_FOUND:
 	   	    	if (sqlErrmc.length() > 0)
-	   	    		throw new DB2Exception("The database '" + sqlErrmc + "' provided was not found", SqlCode.DATABASE_NOT_FOUND, sqlca.sqlState_);
+	   	    		throw new DB2Exception("The database '" + sqlErrmc + "' provided was not found", sqlca.sqlCode_, sqlca.sqlState_);
 	   	    	else
-	   	    		throw new DB2Exception("The database provided was not found", SqlCode.DATABASE_NOT_FOUND, sqlca.sqlState_);
+	   	    		throw new DB2Exception("The database provided was not found", sqlca.sqlCode_, sqlca.sqlState_);
+	   	    case SqlCode.DATA_TYPE_INVALID_ATTR:
+	   	        if (sqlErrmc.length() > 0)
+	   	            throw new DB2Exception("The statement cannot be processed. The data type definition '" + sqlErrmc + 
+	   	                "' specifies an invalid attribute such as precision, length, or scale.", sqlca.sqlCode_, sqlca.sqlState_);
+	   	        else
+	   	            throw new DB2Exception("The statement cannot be processed. A data type definition specifies an invalid attribute such as precision, length, or scale.", sqlca.sqlCode_, sqlca.sqlState_);
             default:
                 throw new IllegalStateException("ERROR: " + sqlca.toString());
 	   }

vertx-db2-client/src/main/java/io/vertx/db2client/impl/drda/SqlCode.java

@@ -40,6 +40,8 @@ public class SqlCode {
 	public static final int OBJECT_NOT_DEFINED = -204;
 	public static final int COLUMN_DOES_NOT_EXIST = -206;
 
+	public static final int DATA_TYPE_INVALID_ATTR = -604;
+	
     private final int code_;
 
     SqlCode(int code) {