Fix mysql keyword conflict (#1245)

tencentmusic · Jun 27, 2024 · d1ec6ba · d1ec6ba
1 parent 90f7a79
commit d1ec6ba
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 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
@@ -35,7 +35,7 @@ public QueryResult execute(ChatExecuteContext chatExecuteContext) {
                         .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
@@ -52,7 +52,7 @@ public void review() {
                 .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/...src/main/java/com/tencent/supersonic/chat/server/persistence/dataobject/ChatMemoryDO.java b/...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/...rver/src/main/java/com/tencent/supersonic/chat/server/service/impl/MemoryServiceImpl.java b/...rver/src/main/java/com/tencent/supersonic/chat/server/service/impl/MemoryServiceImpl.java
@@ -47,7 +47,7 @@ private void enableMemory(ChatMemoryDO memory) {
         exemplarService.storeExemplar(memory.getAgentId().toString(),
                 SqlExemplar.builder()
                         .question(memory.getQuestion())
-                        .dbSchema(memory.getSchema())
+                        .dbSchema(memory.getDbSchema())
                         .sql(memory.getS2sql())
                         .build());
         memory.setStatus(Status.ENABLED);