From d1ec6badce733dac96144ea76ee2bd31789d951b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8C=E6=AF=9B?= <1402564807@qq.com>
Date: Thu, 27 Jun 2024 15:02:19 +0800
Subject: [PATCH] Fix mysql keyword conflict (#1245)

---
 .../tencent/supersonic/chat/server/executor/SqlExecutor.java    | 2 +-
 .../tencent/supersonic/chat/server/memory/MemoryReviewTask.java | 2 +-
 .../chat/server/persistence/dataobject/ChatMemoryDO.java        | 2 +-
 .../supersonic/chat/server/service/impl/MemoryServiceImpl.java  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/executor/SqlExecutor.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/executor/SqlExecutor.java
index a91077128..bb53830ca 100644
--- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/executor/SqlExecutor.java
+++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/executor/SqlExecutor.java
@@ -35,7 +35,7 @@ public class SqlExecutor implements ChatExecutor {
                         .status(ChatMemoryDO.Status.PENDING)
                         .question(chatExecuteContext.getQueryText())
                         .s2sql(chatExecuteContext.getParseInfo().getSqlInfo().getS2SQL())
-                        .schema(buildSchemaStr(chatExecuteContext.getParseInfo()))
+                        .dbSchema(buildSchemaStr(chatExecuteContext.getParseInfo()))
                         .build());
             }
         }
diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/memory/MemoryReviewTask.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/memory/MemoryReviewTask.java
index 74482da4e..6f3c92c18 100644
--- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/memory/MemoryReviewTask.java
+++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/memory/MemoryReviewTask.java
@@ -52,7 +52,7 @@ public class MemoryReviewTask {
                 .filter(c -> c.getStatus() == ChatMemoryDO.Status.PENDING)
                 .forEach(m -> {
                     Agent chatAgent = agentService.getAgent(m.getAgentId());
-                    String promptStr = String.format(INSTRUCTION, m.getQuestion(), m.getSchema(), m.getS2sql());
+                    String promptStr = String.format(INSTRUCTION, m.getQuestion(), m.getDbSchema(), m.getS2sql());
                     Prompt prompt = PromptTemplate.from(promptStr).apply(Collections.EMPTY_MAP);
 
                     keyPipelineLog.info("MemoryReviewTask reqPrompt:{}", promptStr);
diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/dataobject/ChatMemoryDO.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/dataobject/ChatMemoryDO.java
index 984eb3405..9276b9ae8 100644
--- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/dataobject/ChatMemoryDO.java
+++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/dataobject/ChatMemoryDO.java
@@ -25,7 +25,7 @@ public class ChatMemoryDO {
     private Integer agentId;
 
     @TableField("db_schema")
-    private String schema;
+    private String dbSchema;
 
     @TableField("s2_sql")
     private String s2sql;
diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/MemoryServiceImpl.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/MemoryServiceImpl.java
index 26cca016e..5032f9dea 100644
--- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/MemoryServiceImpl.java
+++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/MemoryServiceImpl.java
@@ -47,7 +47,7 @@ public class MemoryServiceImpl implements MemoryService {
         exemplarService.storeExemplar(memory.getAgentId().toString(),
                 SqlExemplar.builder()
                         .question(memory.getQuestion())
-                        .dbSchema(memory.getSchema())
+                        .dbSchema(memory.getDbSchema())
                         .sql(memory.getS2sql())
                         .build());
         memory.setStatus(Status.ENABLED);