From afcd5a060e15207e77f883b6c729659774379f13 Mon Sep 17 00:00:00 2001
From: xieyinglin <xieyinglin1111@163.com>
Date: Fri, 1 Nov 2019 12:59:02 +0800
Subject: [PATCH] fix the tag is placeholder when tableName is static

---
 .../taosdata/jdbc/SavedPreparedStatement.java | 30 +++++++++++++++----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/SavedPreparedStatement.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/SavedPreparedStatement.java
index 98c3fdd7fc..a0aa7ec584 100644
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/SavedPreparedStatement.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/SavedPreparedStatement.java
@@ -186,7 +186,7 @@ public class SavedPreparedStatement {
 
         int paramSize = this.middleParamSize + this.valueListSize;
 
-        String errorMsg = String.format("the parameterIndex %s out of the range [1, %s]", parameterIndex, this.middleParamSize + this.valueListSize);
+        String errorMsg = String.format("the parameterIndex %s out of the range [1, %s]", parameterIndex, paramSize);
 
         if (parameterIndex < 1 || parameterIndex > paramSize) {
             throw new SQLException(TSDBConstants.WrapErrMsg(errorMsg));
@@ -200,13 +200,13 @@ public class SavedPreparedStatement {
 
         parameterIndex = parameterIndex - 1; // start from 0 in param list
 
-        if (this.middleParamSize != 0 && parameterIndex >= 0 && parameterIndex < this.middleParamSize) {
+        if (this.middleParamSize > 0 && parameterIndex >= 0 && parameterIndex < this.middleParamSize) {
 
             this.initPreparedParam.setMiddleParam(parameterIndex, x);
             return;
         }
 
-        if (this.valueListSize != 0 && parameterIndex >= this.middleParamSize && parameterIndex < paramSize) {
+        if (this.valueListSize > 0 && parameterIndex >= this.middleParamSize && parameterIndex < paramSize) {
 
             this.initPreparedParam.setValueParam(parameterIndex - this.middleParamSize, x);
             return;
@@ -255,7 +255,6 @@ public class SavedPreparedStatement {
 
         //1. generate batch sql
         String sql = generateExecuteSql();
-
         //2. execute batch sql
         int result = executeSql(sql);
 
@@ -279,7 +278,8 @@ public class SavedPreparedStatement {
 
         if (!isTableNameDynamic) {
             // tablename will not need to be replaced
-            stringBuilder.append(middle);
+            String middleValue = replaceMiddleListParam(middle, sqlParamList);
+            stringBuilder.append(middleValue);
             stringBuilder.append(" values");
 
             stringBuilder.append(replaceValueListParam(valueList, sqlParamList));
@@ -353,6 +353,26 @@ public class SavedPreparedStatement {
         return stringBuilder.toString();
     }
 
+    /**
+     * replace the placeholder of the middle part of sql template with TSDBPreparedParam list
+     *
+     * @param template
+     * @param sqlParamList
+     * @return
+     */
+    private String replaceMiddleListParam(String template, List<TSDBPreparedParam> sqlParamList) {
+
+        if (sqlParamList.size() > 0) {
+
+            //becase once the subTableName is static then  will be ignore the tag which after the first setTag
+            return replaceTemplateParam(template, sqlParamList.get(0).getMiddleParamList());
+
+        }
+
+        return template;
+    }
+
+
     /**
      * replace the placeholder of the template with TSDBPreparedParam list
      *
-- 
GitLab