Fix kingbase8r6 error

Chat2DB-Pro · Chat2DB-Pro · commit 1a063321be00 · 2023-11-12T11:06:22.000+08:00
diff --git a/chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/impl/DatabaseServiceImpl.java b/chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/impl/DatabaseServiceImpl.java
@@ -89,7 +89,8 @@ private void sortSchema(List<Schema> schemas, Connection connection) {
         // If the database name contains the name of the current database, the current database is placed in the first place
         int num = -1;
         for (int i = 0; i < schemas.size(); i++) {
-            if (StringUtils.isNotBlank(ulr) && ulr.contains(schemas.get(i).getName())) {
+            String schema = schemas.get(i).getName();
+            if (StringUtils.isNotBlank(ulr) && schema!=null && ulr.contains(schema)) {
                 num = i;
                 break;
             }
diff --git a/chat2db-server/chat2db-spi/src/main/java/ai/chat2db/spi/jdbc/DefaultMetaService.java b/chat2db-server/chat2db-spi/src/main/java/ai/chat2db/spi/jdbc/DefaultMetaService.java
@@ -26,7 +26,15 @@ public List<Database> databases(Connection connection) {
 
     @Override
     public List<Schema> schemas(Connection connection, String databaseName) {
-        return SQLExecutor.getInstance().schemas(connection, databaseName, null);
+        List<Schema> schemas = SQLExecutor.getInstance().schemas(connection, databaseName, null);
+        if(StringUtils.isNotBlank(databaseName) && CollectionUtils.isNotEmpty(schemas)){
+            for ( Schema schema : schemas) {
+                if(StringUtils.isBlank(schema.getDatabaseName())){
+                    schema.setDatabaseName(databaseName);
+                }
+            }
+        }
+        return schemas;
     }
 
     @Override
diff --git a/chat2db-server/chat2db-spi/src/main/java/ai/chat2db/spi/model/Schema.java b/chat2db-server/chat2db-spi/src/main/java/ai/chat2db/spi/model/Schema.java
@@ -24,12 +24,12 @@ public class Schema implements Serializable {
     /**
      * databaseName
      */
-    @JsonAlias({"TABLE_CATALOG"})
+    @JsonAlias({"TABLE_CATALOG","table_catalog"})
     private String databaseName;
     /**
      * 数据名字
      */
-    @JsonAlias({"TABLE_SCHEM"})
+    @JsonAlias({"TABLE_SCHEM","table_schem"})
     private String name;
 
 
