Support NaN values in JSON Column Type

Author: sharadraju

doc/src/release_notes.rst

@@ -26,6 +26,9 @@ Common Changes
     for the :meth:`sodaOperation.limit()` and :meth:`sodaOperation.skip()`
     methods in SODA operations.
 
+#)  Fixed bug that threw empty error message when NaN values were used
+    in JSON binds.
+
 Thin Mode Changes
 +++++++++++++++++
 

lib/impl/datahandlers/oson.js

@@ -549,8 +549,13 @@ class OsonTreeSegment extends GrowableBuffer {
 
     // handle numbers
     } else if (typeof value === 'number') {
-      this.writeUInt8(constants.TNS_JSON_TYPE_NUMBER_LENGTH_UINT8);
-      this.writeOracleNumber(value.toString());
+      if (Number.isNaN(value)) {
+        this.writeUInt8(constants.TNS_JSON_TYPE_BINARY_DOUBLE);
+        this.writeBinaryDouble(value);
+      } else {
+        this.writeUInt8(constants.TNS_JSON_TYPE_NUMBER_LENGTH_UINT8);
+        this.writeOracleNumber(value.toString());
+      }
 
     // handle strings
     } else if (typeof value === 'string') {

src/njsJsonBuffer.c

@@ -180,10 +180,15 @@ static bool njsJsonBuffer_populateNode(njsJsonBuffer *buf, dpiJsonNode *node,
 
     // handle numbers
     if (valueType == napi_number) {
-        node->oracleTypeNum = DPI_ORACLE_TYPE_NUMBER;
         node->nativeTypeNum = DPI_NATIVE_TYPE_DOUBLE;
         NJS_CHECK_NAPI(env, napi_get_value_double(env, value,
                 &node->value->asDouble))
+
+        // pass in NaN JSON value as Binary Double in OSON
+        if (isnan(node->value->asDouble))
+            node->oracleTypeNum = DPI_ORACLE_TYPE_NATIVE_DOUBLE;
+        else
+            node->oracleTypeNum = DPI_ORACLE_TYPE_NUMBER;
         return true;
     }
 

src/njsModule.h

@@ -40,9 +40,17 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <math.h>
 #include "dpi.h"
 #include "uv.h"
 
+#ifdef _WIN32
+#include <windows.h>
+#ifndef isnan
+#define isnan                   _isnan
+#endif
+#endif
+
 // maximum length of error messages
 #define NJS_MAX_ERROR_MSG_LEN           256
 

src/njsVariable.c

@@ -903,7 +903,7 @@ bool njsVariable_setScalarValue(njsVariable *var, uint32_t pos, napi_env env,
         }
         if (dpiJson_setValue(data->value.asJson, &jsonBuffer.topNode) < 0) {
             njsJsonBuffer_free(&jsonBuffer);
-            return false;
+            return njsBaton_setErrorDPI(baton);
         }
         njsJsonBuffer_free(&jsonBuffer);
         return true;

test/dbType04.js

@@ -449,7 +449,7 @@ describe('241. dbType04.js', function() {
     assert.deepStrictEqual(result2.rows[0][1], jsonVal);
   }); // 241.20
 
-  it.skip('241.21 NaN', async () => {
+  it('241.21 NaN', async () => {
     const jsonId = 21;
     const jsonVal = NaN;
     const sqlOne = `insert into ${TABLE} values (:1, :2)`;
@@ -458,12 +458,10 @@ describe('241. dbType04.js', function() {
       { val: jsonVal, type: oracledb.DB_TYPE_JSON }
     ];
     const result1 = await conn.execute(sqlOne, binds);
-    //assert.strictEqual(result1.rowsAffected, 1);
-    console.log(result1);
-    // const sqlTwo = `select * from ${TABLE} where id = ${jsonId}`;
-    // const result2 = await conn.execute(sqlTwo);
-    // console.log(result2.rows[0][1]);
-    // assert.strictEqual(result2.rows[0][1], jsonVal);
+    assert.strictEqual(result1.rowsAffected, 1);
+    const sqlTwo = `select * from ${TABLE} where id = ${jsonId}`;
+    const result2 = await conn.execute(sqlTwo);
+    assert.strictEqual(result2.rows[0][1], jsonVal);
   }); // 241.21
 
   it('241.22 Negative - implicitly binding JSON', async () => {