Fix a bug in Thick mode which inserted invalid value if an unacceptable out of bound number is given (Issue #1659)

Author: sharadraju

doc/src/release_notes.rst

@@ -28,6 +28,15 @@ Thin Mode Changes
 #)  Added support for Oracle Database 23c
     :ref:`Implicit Connection Pooling <implicitpool>` in DRCP and PRCP.
 
+Thick Mode Changes
++++++++++++++++++++
+
+#)  Fix bug which inserted invalid value `~` if an unacceptable out of bound number is given.
+    Now, numbers like 1.0e+128, -1e128, etc. will throw an error ``NJS-115: value cannot be represented
+    as an Oracle Database number``
+    Additionally, it resolves the issue related to JS numbers with precisions where
+   `2.3` is returned as `2.300003`.
+
 node-oracledb `v6.4.0 <https://github.com/oracle/node-oracledb/compare/v6.3.0...v6.4.0>`__ (11 Mar 2024)
 --------------------------------------------------------------------------------------------------------
 

src/njsVariable.c

@@ -63,13 +63,13 @@ bool njsVariable_createBuffer(njsVariable *var, njsConnection *conn,
         case DPI_ORACLE_TYPE_LONG_VARCHAR:
         case DPI_ORACLE_TYPE_LONG_RAW:
         case DPI_ORACLE_TYPE_XMLTYPE:
+        case DPI_ORACLE_TYPE_NUMBER:
             var->nativeTypeNum = DPI_NATIVE_TYPE_BYTES;
             break;
         case DPI_ORACLE_TYPE_NATIVE_FLOAT:
             var->nativeTypeNum = DPI_NATIVE_TYPE_FLOAT;
             break;
         case DPI_ORACLE_TYPE_NATIVE_DOUBLE:
-        case DPI_ORACLE_TYPE_NUMBER:
             var->nativeTypeNum = DPI_NATIVE_TYPE_DOUBLE;
             break;
         case DPI_ORACLE_TYPE_DATE:
@@ -382,6 +382,7 @@ bool njsVariable_getScalarValue(njsVariable *var, njsConnection *conn,
     const char *rowidValue;
     dpiJsonNode *topNode;
     dpiData *data;
+    napi_value numStr;
 
     // get the value from ODPI-C
     bufferRowIndex = baton->bufferRowIndex + pos;
@@ -413,19 +414,26 @@ bool njsVariable_getScalarValue(njsVariable *var, njsConnection *conn,
                     value))
             break;
         case DPI_NATIVE_TYPE_BYTES:
-            if (data->value.asBytes.length > var->maxSize)
-                return njsBaton_setErrorInsufficientBufferForBinds(baton);
-            if (data->value.asBytes.length == 0) {
-                NJS_CHECK_NAPI(env, napi_get_null(env, value))
-            } else if (var->varTypeNum == DPI_ORACLE_TYPE_RAW ||
-                    var->varTypeNum == DPI_ORACLE_TYPE_LONG_RAW) {
-                NJS_CHECK_NAPI(env, napi_create_buffer_copy(env,
-                        data->value.asBytes.length, data->value.asBytes.ptr,
-                        NULL, value))
-            } else {
+            if (var->varTypeNum == DPI_ORACLE_TYPE_NUMBER) {
                 NJS_CHECK_NAPI(env, napi_create_string_utf8(env,
                         data->value.asBytes.ptr, data->value.asBytes.length,
-                        value))
+                        &numStr))
+                NJS_CHECK_NAPI(env, napi_coerce_to_number(env, numStr, value))
+            } else {
+                if (data->value.asBytes.length > var->maxSize)
+                    return njsBaton_setErrorInsufficientBufferForBinds(baton);
+                if (data->value.asBytes.length == 0) {
+                    NJS_CHECK_NAPI(env, napi_get_null(env, value))
+                } else if (var->varTypeNum == DPI_ORACLE_TYPE_RAW ||
+                        var->varTypeNum == DPI_ORACLE_TYPE_LONG_RAW) {
+                    NJS_CHECK_NAPI(env, napi_create_buffer_copy(env,
+                            data->value.asBytes.length, data->value.asBytes.ptr,
+                            NULL, value))
+                } else {
+                    NJS_CHECK_NAPI(env, napi_create_string_utf8(env,
+                            data->value.asBytes.ptr, data->value.asBytes.length,
+                            value))
+                }
             }
             break;
         case DPI_NATIVE_TYPE_LOB:
@@ -760,6 +768,7 @@ bool njsVariable_setScalarValue(njsVariable *var, uint32_t pos, napi_env env,
     napi_typedarray_type type;
     void *rawdata = NULL;
     size_t numElem = 0;
+    napi_value numStr;
 
     // initialization
     data = &var->buffer->dpiVarData[pos];
@@ -815,6 +824,11 @@ bool njsVariable_setScalarValue(njsVariable *var, uint32_t pos, napi_env env,
 
     // handle binding numbers
     if (valueType == napi_number) {
+        if (var->varTypeNum == DPI_ORACLE_TYPE_NUMBER) {
+            NJS_CHECK_NAPI(env, napi_coerce_to_string(env, value, &numStr));
+            return njsVariable_setFromString(var, pos, env, numStr, baton);
+        }
+
         NJS_CHECK_NAPI(env, napi_get_value_double(env, value, &tempDouble))
         if (var->varTypeNum == DPI_ORACLE_TYPE_NATIVE_FLOAT) {
             data->value.asFloat = (float) tempDouble;

test/dataTypeAssist.js

@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, 2023, Oracle and/or its affiliates. */
+/* Copyright (c) 2015, 2024, Oracle and/or its affiliates. */
 
 /******************************************************************************
  *
@@ -178,6 +178,8 @@ assist.data = {
     -8,
     1234,
     -1234,
+    2.3,
+    -2.3,
     9876.54321,
     -9876.54321,
     0.01234,

test/invalidNumber.js

@@ -0,0 +1,61 @@
+/* Copyright (c) 2024, Oracle and/or its affiliates. */
+
+/******************************************************************************
+ *
+ * This software is dual-licensed to you under the Universal Permissive License
+ * (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
+ * 2.0 as shown at https://www.apache.org/licenses/LICENSE-2.0. You may choose
+ * either license.
+ *
+ * If you elect to accept the software under the Apache License, Version 2.0,
+ * the following applies:
+ *
+ * Licensed under the Apache License, Version 2.0 (the `License`);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an `AS IS` BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * NAME
+ *   299. invalidNumber.js
+ *
+ * DESCRIPTION
+ *   Testing insertion of invalid numbers to the database
+ *
+ *****************************************************************************/
+'use strict';
+
+const oracledb = require('oracledb');
+const assert   = require('assert');
+const dbConfig = require('./dbconfig.js');
+
+describe('299. invalidNumber.js', function() {
+  let conn;
+
+  before(async function() {
+    conn = await oracledb.getConnection(dbConfig);
+    await conn.execute('CREATE TABLE nodb_num(id NUMBER)');
+  });
+
+  after(async function() {
+    await conn.execute('DROP TABLE nodb_num PURGE');
+    await conn.close();
+  });
+
+  it('299.1 throws error for invalid numbers', async () => {
+    const idv = 1e+131;
+    const sql = 'INSERT INTO nodb_num VALUES(:cid)';
+    const binds = { cid: { val: idv, type: oracledb.NUMBER}};
+    await assert.rejects(
+      async () => await conn.execute(sql, binds),
+      /NJS-115:/
+    );
+  }); //299.1
+
+});

test/list.txt

@@ -5795,4 +5795,7 @@ oracledb.OUT_FORMAT_OBJECT and resultSet =  true
     298.7 average vector distance function vector columns with parallel execution
     298.8 aggregate functions on vector columns vector columns with parallel execution
     298.9 parallel delete operation on vector columns
-    298.10 no parallel delete operation on vector columns
+    298.10 no parallel delete operation on vector columns
+
+  299. invalidNumber.js
+    299.1 throws error for invalid numbers

test/opts/.mocharc.yaml

@@ -280,3 +280,4 @@ spec:
   - test/dataTypeVector2.js
   - test/dataTypeVector3.js
   - test/jsonDualityViews7.js
+  - test/invalidNumber.js