From 053ed0d30a7b87359b4b2242aa24486d92a26934 Mon Sep 17 00:00:00 2001
From: zgq <203083679@qq.com>
Date: Fri, 24 May 2024 22:00:45 +0800
Subject: [PATCH] fix escapeString

---
 .../chat2db/plugin/mysql/type/MysqlValueProcessorEnum.java | 7 ++++---
 .../java/ai/chat2db/spi/jdbc/DefaultSQLValueProcessor.java | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/chat2db-server/chat2db-plugins/chat2db-mysql/src/main/java/ai/chat2db/plugin/mysql/type/MysqlValueProcessorEnum.java b/chat2db-server/chat2db-plugins/chat2db-mysql/src/main/java/ai/chat2db/plugin/mysql/type/MysqlValueProcessorEnum.java
index a9a69e6b..1246777b 100644
--- a/chat2db-server/chat2db-plugins/chat2db-mysql/src/main/java/ai/chat2db/plugin/mysql/type/MysqlValueProcessorEnum.java
+++ b/chat2db-server/chat2db-plugins/chat2db-mysql/src/main/java/ai/chat2db/plugin/mysql/type/MysqlValueProcessorEnum.java
@@ -1,6 +1,7 @@
 package ai.chat2db.plugin.mysql.type;
 
 import ai.chat2db.spi.SQLValueProcessor;
+import ai.chat2db.spi.jdbc.DefaultSQLValueProcessor;
 import org.locationtech.jts.geom.Geometry;
 import org.locationtech.jts.io.WKBReader;
 
@@ -10,7 +11,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 
 public enum MysqlValueProcessorEnum implements SQLValueProcessor {
-    GEOMETRY{
+    GEOMETRY {
         @Override
         public String getSqlValueString(ResultSet rs, int index) throws SQLException {
             try {
@@ -62,9 +63,9 @@ public enum MysqlValueProcessorEnum implements SQLValueProcessor {
                     dbGeometry = wkbReader.read(wkb);
                     dbGeometry.setSRID(srid);
                 }
-                return dbGeometry.toString();
+                return DefaultSQLValueProcessor.escapeString(dbGeometry.toString());
             } catch (Exception e) {
-                return rs.getString(index);
+                return DefaultSQLValueProcessor.escapeString(rs.getString(index));
             }
         }
     };
diff --git a/chat2db-server/chat2db-spi/src/main/java/ai/chat2db/spi/jdbc/DefaultSQLValueProcessor.java b/chat2db-server/chat2db-spi/src/main/java/ai/chat2db/spi/jdbc/DefaultSQLValueProcessor.java
index 9f699e34..e93e8a64 100644
--- a/chat2db-server/chat2db-spi/src/main/java/ai/chat2db/spi/jdbc/DefaultSQLValueProcessor.java
+++ b/chat2db-server/chat2db-spi/src/main/java/ai/chat2db/spi/jdbc/DefaultSQLValueProcessor.java
@@ -50,7 +50,7 @@ public class DefaultSQLValueProcessor implements SQLValueProcessor {
         return "'" + escapeString(object) + "'";
     }
 
-    private String escapeString(Object object) {
+    public static String escapeString(Object object) {
         String s = (String) object;
         if (StringUtils.isBlank(s)) {
             return "";
@@ -58,7 +58,7 @@ public class DefaultSQLValueProcessor implements SQLValueProcessor {
         return s.replace("\\", "\\\\").replace("'", "''");
     }
 
-    private String converterClob2Str(Clob c) {
+    public static String converterClob2Str(Clob c) {
         StringBuilder stringBuilder = new StringBuilder();
         try (Reader reader = c.getCharacterStream()) {
             BufferedReader bufferedReader = new BufferedReader(reader);
@@ -72,7 +72,7 @@ public class DefaultSQLValueProcessor implements SQLValueProcessor {
         }
     }
 
-    private String converterByteArray2Str(byte[] bytes) {
+    public static String converterByteArray2Str(byte[] bytes) {
         return "0x" + BaseEncoding.base16().encode(bytes);
     }
 }