From d78ac9848c3efd37107b886bd1f6e1780b805d86 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Fri, 30 Apr 2021 17:12:20 +0800
Subject: [PATCH] [td-3967]1) refactor.

---
 src/client/src/tscParseInsert.c                      | 12 +++++++++---
 .../script/general/parser/binary_escapeCharacter.sim |  9 +++++++++
 tests/script/general/parser/testSuite.sim            |  1 +
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/client/src/tscParseInsert.c b/src/client/src/tscParseInsert.c
index 298f1245e7..9130118f80 100644
--- a/src/client/src/tscParseInsert.c
+++ b/src/client/src/tscParseInsert.c
@@ -462,13 +462,19 @@ int tsParseOneRow(char **str, STableDataBlocks *pDataBlocks, SSqlCmd *pCmd, int1
     // Remove quotation marks
     if (TK_STRING == sToken.type) {
       // delete escape character: \\, \', \"
+      char delim = sToken.z[0];
+
       int32_t cnt = 0;
       int32_t j = 0;
       for (uint32_t k = 1; k < sToken.n - 1; ++k) {
-        if (sToken.z[k] == '\\') {
-          cnt++;
+        if (sToken.z[k] == '\\' || (sToken.z[k] == delim && sToken.z[k + 1] == delim)) {
+          if (sToken.z[k] == '\\') {
+            tmpTokenBuf[j] = GET_ESCAPE_CHAR(sToken.z[k+1]);
+          } else {
+            tmpTokenBuf[j] = sToken.z[k + 1];
+          }
 
-          tmpTokenBuf[j] = GET_ESCAPE_CHAR(sToken.z[k+1]);
+          cnt++;
           j++;
           k++;
           continue;
diff --git a/tests/script/general/parser/binary_escapeCharacter.sim b/tests/script/general/parser/binary_escapeCharacter.sim
index f0589d154f..1c6bc5b37f 100644
--- a/tests/script/general/parser/binary_escapeCharacter.sim
+++ b/tests/script/general/parser/binary_escapeCharacter.sim
@@ -93,5 +93,14 @@ if $data41 != @udp005@ then
   print "[ERROR] expect: udp005, act:$data41"
 endi
 
+print ---------------------> TD-3967
+sql insert into tb values(now, '\\abc\\\\');
+sql insert into tb values(now, '\\abc\\\\');
+sql insert into tb values(now, '\\\\');
+
+print ------------->sim bug
+# sql_error insert into tb values(now, '\\\');
+# sql_error insert into tb values(now, '\\');
+# sql_error insert into tb values(now, '\\n');
 
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/parser/testSuite.sim b/tests/script/general/parser/testSuite.sim
index f05474d158..b605a04df7 100644
--- a/tests/script/general/parser/testSuite.sim
+++ b/tests/script/general/parser/testSuite.sim
@@ -55,4 +55,5 @@ run general/parser/sliding.sim
 run general/parser/function.sim
 run general/parser/stableOp.sim
 run general/parser/slimit_alter_tags.sim
+run general/parser/binary_escapeCharacter.sim
 
-- 
GitLab