From 067219376ce78080fd1446453329029694dc8d28 Mon Sep 17 00:00:00 2001
From: Linhe Huo <linhehuo@gmail.com>
Date: Wed, 30 Jun 2021 20:16:22 +0800
Subject: [PATCH] [TD-4641]<fix>: fix nodejs query result error (#6448)

Update Node.js connector version to v2.0.8
---
 src/connector/nodejs/nodetaos/cinterface.js | 24 ++++++---------------
 src/connector/nodejs/package.json           |  2 +-
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/src/connector/nodejs/nodetaos/cinterface.js b/src/connector/nodejs/nodetaos/cinterface.js
index f3961e3787..1c2685b8cb 100644
--- a/src/connector/nodejs/nodetaos/cinterface.js
+++ b/src/connector/nodejs/nodetaos/cinterface.js
@@ -126,30 +126,20 @@ function convertDouble(data, num_of_rows, nbytes = 0, offset = 0, micro = false)
   }
   return res;
 }
-function convertBinary(data, num_of_rows, nbytes = 0, offset = 0, micro = false) {
+
+function convertNchar(data, num_of_rows, nbytes = 0, offset = 0, micro = false) {
   data = ref.reinterpret(data.deref(), nbytes * num_of_rows, offset);
   let res = [];
+
   let currOffset = 0;
   while (currOffset < data.length) {
-    let dataEntry = data.slice(currOffset, currOffset + nbytes);
-    if (dataEntry[0] == FieldTypes.C_BINARY_NULL) {
-      res.push(null);
-    }
-    else {
-      res.push(ref.readCString(dataEntry));
-    }
+    let len = data.readIntLE(currOffset, 2);
+    let dataEntry = data.slice(currOffset + 2, currOffset + len + 2); //one entry in a row under a column;
+    res.push(dataEntry.toString("utf-8"));
     currOffset += nbytes;
   }
   return res;
 }
-function convertNchar(data, num_of_rows, nbytes = 0, offset = 0, micro = false) {
-  data = ref.reinterpret(data.deref(), nbytes * num_of_rows, offset);
-  let res = [];
-  let dataEntry = data.slice(0, nbytes); //one entry in a row under a column;
-  //TODO: should use the correct character encoding 
-  res.push(dataEntry.toString("utf-8"));
-  return res;
-}
 
 // Object with all the relevant converters from pblock data to javascript readable data
 let convertFunctions = {
@@ -160,7 +150,7 @@ let convertFunctions = {
   [FieldTypes.C_BIGINT]: convertBigint,
   [FieldTypes.C_FLOAT]: convertFloat,
   [FieldTypes.C_DOUBLE]: convertDouble,
-  [FieldTypes.C_BINARY]: convertBinary,
+  [FieldTypes.C_BINARY]: convertNchar,
   [FieldTypes.C_TIMESTAMP]: convertTimestamp,
   [FieldTypes.C_NCHAR]: convertNchar
 }
diff --git a/src/connector/nodejs/package.json b/src/connector/nodejs/package.json
index d21b62108b..b57d4c635c 100644
--- a/src/connector/nodejs/package.json
+++ b/src/connector/nodejs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "td2.0-connector",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "description": "A Node.js connector for TDengine.",
   "main": "tdengine.js",
   "directories": {
-- 
GitLab