opensource/Chat2DB
1
0
Fork 0
mirror of https://github.com/CodePhiliaX/Chat2DB.git synced 2025-08-03 06:17:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix sort database error,Fix sqlite query data error

Browse Source
This commit is contained in:
SwallowGG
2023-10-30 11:39:06 +08:00
parent 17b1edcfe8
commit d5b9ab2d30
20 changed files with 36 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
chat2db-server/chat2db-plugins/chat2db-clickhouse/src/main/java/ai/chat2db/plugin/clickhouse/builder/DBConfigBuilder.java
View File

@ -13,7 +13,7 @@ public class DBConfigBuilder {
DriverConfig driverConfig = new DriverConfig();
driverConfig.setJdbcDriver("clickhouse-jdbc-0.3.2-patch8-http.jar");
driverConfig.setJdbcDriverClass("com.clickhouse.jdbc.ClickHouseDriver");
driverConfig.setDownloadJdbcDriverUrls(Lists.newArrayList("https://oss-chat2db.alibaba.com/lib/clickhouse-jdbc-0.3.2-patch8-http.jar"));
driverConfig.setDownloadJdbcDriverUrls(Lists.newArrayList("https://oss.sqlgpt.cn/lib/clickhouse-jdbc-0.3.2-patch8-http.jar"));
dbConfig.setDefaultDriverConfig(driverConfig);
dbConfig.setDriverConfigList(Lists.newArrayList(driverConfig));

2
chat2db-server/chat2db-plugins/chat2db-db2/src/main/java/ai/chat2db/plugin/db2/builder/DBConfigBuilder.java
View File

@ -13,7 +13,7 @@ public class DBConfigBuilder {
DriverConfig driverConfig = new DriverConfig();
driverConfig.setJdbcDriver("db2jcc4_4.26.14.jar");
driverConfig.setJdbcDriverClass("com.ibm.db2.jcc.DB2Driver");
driverConfig.setDownloadJdbcDriverUrls(Lists.newArrayList("https://oss-chat2db.alibaba.com/lib/db2jcc4_4.26.14.jar"));
driverConfig.setDownloadJdbcDriverUrls(Lists.newArrayList("https://oss.sqlgpt.cn/lib/db2jcc4_4.26.14.jar"));
dbConfig.setDefaultDriverConfig(driverConfig);
dbConfig.setDriverConfigList(Lists.newArrayList(driverConfig));

2
chat2db-server/chat2db-plugins/chat2db-dm/src/main/java/ai/chat2db/plugin/dm/builder/DBConfigBuilder.java
View File

@ -14,7 +14,7 @@ public class DBConfigBuilder {
DriverConfig driverConfig = new DriverConfig();
driverConfig.setJdbcDriver("DmJdbcDriver18-8.1.2.141.jar");
driverConfig.setJdbcDriverClass("dm.jdbc.driver.DmDriver");
driverConfig.setDownloadJdbcDriverUrls(Lists.newArrayList("https://oss-chat2db.alibaba.com/lib/DmJdbcDriver18-8.1.2.141.jar"));
driverConfig.setDownloadJdbcDriverUrls(Lists.newArrayList("https://oss.sqlgpt.cn/lib/DmJdbcDriver18-8.1.2.141.jar"));
dbConfig.setDefaultDriverConfig(driverConfig);
dbConfig.setDriverConfigList(Lists.newArrayList(driverConfig));

2
chat2db-server/chat2db-plugins/chat2db-h2/src/main/java/ai/chat2db/plugin/h2/builder/DBConfigBuilder.java
View File

@ -14,7 +14,7 @@ public class DBConfigBuilder {
DriverConfig driverConfig = new DriverConfig();
driverConfig.setJdbcDriver("h2-2.1.214.jar");
driverConfig.setJdbcDriverClass("org.h2.Driver");
driverConfig.setDownloadJdbcDriverUrls(Lists.newArrayList("https://oss-chat2db.alibaba.com/lib/h2-2.1.214.jar"));
driverConfig.setDownloadJdbcDriverUrls(Lists.newArrayList("https://oss.sqlgpt.cn/lib/h2-2.1.214.jar"));
dbConfig.setDefaultDriverConfig(driverConfig);
dbConfig.setDriverConfigList(Lists.newArrayList(driverConfig));

2
chat2db-server/chat2db-plugins/chat2db-hive/src/main/java/ai/chat2db/plugin/hive/builder/DBConfigBuilder.java
View File

@ -12,7 +12,7 @@ public class DBConfigBuilder {
DriverConfig driverConfig = new DriverConfig();
driverConfig.setJdbcDriver("hive-jdbc-3.1.2-standalone.jar");
driverConfig.setJdbcDriverClass("org.apache.hive.jdbc.HiveDriver");
driverConfig.setDownloadJdbcDriverUrls(Lists.newArrayList("https://oss-chat2db.alibaba.com/lib/hive-jdbc-3.1.2-standalone.jar"));
driverConfig.setDownloadJdbcDriverUrls(Lists.newArrayList("https://oss.sqlgpt.cn/lib/hive-jdbc-3.1.2-standalone.jar"));
dbConfig.setDefaultDriverConfig(driverConfig);
dbConfig.setDriverConfigList(Lists.newArrayList(driverConfig));
return dbConfig;

2
chat2db-server/chat2db-plugins/chat2db-kingbase/src/main/java/ai/chat2db/plugin/kingbase/builder/DBConfigBuilder.java
View File

@ -12,7 +12,7 @@ public class DBConfigBuilder {
DriverConfig driverConfig = new DriverConfig();
driverConfig.setJdbcDriver("kingbase8-8.6.0.jar");
driverConfig.setJdbcDriverClass("com.kingbase8.Driver");
driverConfig.setDownloadJdbcDriverUrls(Lists.newArrayList("https://oss-chat2db.alibaba.com/lib/kingbase8-8.6.0.jar"));
driverConfig.setDownloadJdbcDriverUrls(Lists.newArrayList("https://oss.sqlgpt.cn/lib/kingbase8-8.6.0.jar"));
dbConfig.setDefaultDriverConfig(driverConfig);
dbConfig.setDriverConfigList(Lists.newArrayList(driverConfig));
return dbConfig;

2
chat2db-server/chat2db-plugins/chat2db-mariadb/src/main/java/ai/chat2db/plugin/mariadb/builder/DBConfigBuilder.java
View File

@ -12,7 +12,7 @@ public class DBConfigBuilder {
DriverConfig driverConfig = new DriverConfig();
driverConfig.setJdbcDriver("mariadb-java-client-3.0.8.jar");
driverConfig.setJdbcDriverClass("org.mariadb.jdbc.Driver");
driverConfig.setDownloadJdbcDriverUrls(Lists.newArrayList("https://oss-chat2db.alibaba.com/lib/mariadb-java-client-3.0.8.jar"));
driverConfig.setDownloadJdbcDriverUrls(Lists.newArrayList("https://oss.sqlgpt.cn/lib/mariadb-java-client-3.0.8.jar"));
dbConfig.setDefaultDriverConfig(driverConfig);
dbConfig.setDriverConfigList(Lists.newArrayList(driverConfig));
return dbConfig;

2
chat2db-server/chat2db-plugins/chat2db-mongodb/src/main/java/ai/chat2db/plugin/mongodb/builder/DBConfigBuilder.java
View File

@ -12,7 +12,7 @@ public class DBConfigBuilder {
DriverConfig driverConfig = new DriverConfig();
driverConfig.setJdbcDriver("mongo-jdbc-standalone-1.18.jar");
driverConfig.setJdbcDriverClass("com.dbschema.MongoJdbcDriver");
driverConfig.setDownloadJdbcDriverUrls(Lists.newArrayList("https://oss-chat2db.alibaba.com/lib/mongo-jdbc-standalone-1.18.jar"));
driverConfig.setDownloadJdbcDriverUrls(Lists.newArrayList("https://oss.sqlgpt.cn/lib/mongo-jdbc-standalone-1.18.jar"));
dbConfig.setDefaultDriverConfig(driverConfig);
dbConfig.setDriverConfigList(Lists.newArrayList(driverConfig));
return dbConfig;

4
chat2db-server/chat2db-plugins/chat2db-mysql/src/main/java/ai/chat2db/plugin/mysql/builder/DBConfigBuilder.java
View File

@ -14,14 +14,14 @@ public class DBConfigBuilder {
DriverConfig driverConfig = new DriverConfig();
driverConfig.setJdbcDriver("mysql-connector-java-8.0.30.jar");
driverConfig.setJdbcDriverClass("com.mysql.cj.jdbc.Driver");
driverConfig.setDownloadJdbcDriverUrls(Lists.newArrayList("https://oss-chat2db.alibaba.com/lib/mysql-connector-java-8.0.30.jar"));
driverConfig.setDownloadJdbcDriverUrls(Lists.newArrayList("https://oss.sqlgpt.cn/lib/mysql-connector-java-8.0.30.jar"));
dbConfig.setDefaultDriverConfig(driverConfig);
DriverConfig driverConfig2 = new DriverConfig();
driverConfig2.setJdbcDriver("mysql-connector-java-5.1.47.jar");
driverConfig2.setJdbcDriverClass("com.mysql.jdbc.Driver");
driverConfig2.setDownloadJdbcDriverUrls(Lists.newArrayList("https://oss-chat2db.alibaba.com/lib/mysql-connector-java-5.1.47.jar"));
driverConfig2.setDownloadJdbcDriverUrls(Lists.newArrayList("https://oss.sqlgpt.cn/lib/mysql-connector-java-5.1.47.jar"));
dbConfig.setDriverConfigList(Lists.newArrayList(driverConfig,driverConfig2));
return dbConfig;

2
chat2db-server/chat2db-plugins/chat2db-oceanbase/src/main/java/ai/chat2db/plugin/oceanbase/builder/DBConfigBuilder.java
View File

@ -12,7 +12,7 @@ public class DBConfigBuilder {
DriverConfig driverConfig = new DriverConfig();
driverConfig.setJdbcDriver("oceanbase-client-2.4.2.jar");
driverConfig.setJdbcDriverClass("com.oceanbase.jdbc.Driver");
driverConfig.setDownloadJdbcDriverUrls(Lists.newArrayList("https://oss-chat2db.alibaba.com/lib/oceanbase-client-2.4.2.jar"));
driverConfig.setDownloadJdbcDriverUrls(Lists.newArrayList("https://oss.sqlgpt.cn/lib/oceanbase-client-2.4.2.jar"));
dbConfig.setDefaultDriverConfig(driverConfig);
dbConfig.setDriverConfigList(Lists.newArrayList(driverConfig));
return dbConfig;

2
chat2db-server/chat2db-plugins/chat2db-oracle/src/main/java/ai/chat2db/plugin/oracle/builder/DBConfigBuilder.java
View File

@ -14,7 +14,7 @@ public class DBConfigBuilder {
DriverConfig driverConfig = new DriverConfig();
driverConfig.setJdbcDriver("ojdbc8-19.3.0.0.jar,orai18n-19.3.0.0.jar");
driverConfig.setJdbcDriverClass("oracle.jdbc.driver.OracleDriver");
driverConfig.setDownloadJdbcDriverUrls(Lists.newArrayList("https://oss-chat2db.alibaba.com/lib/ojdbc8-19.3.0.0.jar", "https://oss-chat2db.alibaba.com/lib/orai18n-19.3.0.0.jar"));
driverConfig.setDownloadJdbcDriverUrls(Lists.newArrayList("https://oss.sqlgpt.cn/lib/ojdbc8-19.3.0.0.jar", "https://oss.sqlgpt.cn/lib/orai18n-19.3.0.0.jar"));
dbConfig.setDefaultDriverConfig(driverConfig);
dbConfig.setDriverConfigList(Lists.newArrayList(driverConfig));

2
chat2db-server/chat2db-plugins/chat2db-postgresql/src/main/java/ai/chat2db/plugin/postgresql/builder/DBConfigBuilder.java
View File

@ -13,7 +13,7 @@ public class DBConfigBuilder {
DriverConfig driverConfig = new DriverConfig();
driverConfig.setJdbcDriver("postgresql-42.5.1.jar");
driverConfig.setJdbcDriverClass("org.postgresql.Driver");
driverConfig.setDownloadJdbcDriverUrls(Lists.newArrayList("https://oss-chat2db.alibaba.com/lib/postgresql-42.5.1.jar"));
driverConfig.setDownloadJdbcDriverUrls(Lists.newArrayList("https://oss.sqlgpt.cn/lib/postgresql-42.5.1.jar"));
dbConfig.setDefaultDriverConfig(driverConfig);
dbConfig.setDriverConfigList(Lists.newArrayList(driverConfig));
return dbConfig;

2
chat2db-server/chat2db-plugins/chat2db-presto/src/main/java/ai/chat2db/plugin/presto/builder/DBConfigBuilder.java
View File

@ -12,7 +12,7 @@ public class DBConfigBuilder {
DriverConfig driverConfig = new DriverConfig();
driverConfig.setJdbcDriver("presto-jdbc-0.245.1.jar");
driverConfig.setJdbcDriverClass("com.facebook.presto.jdbc.PrestoDriver");
driverConfig.setDownloadJdbcDriverUrls(Lists.newArrayList("https://oss-chat2db.alibaba.com/lib/presto-jdbc-0.245.1.jar"));
driverConfig.setDownloadJdbcDriverUrls(Lists.newArrayList("https://oss.sqlgpt.cn/lib/presto-jdbc-0.245.1.jar"));
dbConfig.setDefaultDriverConfig(driverConfig);
dbConfig.setDriverConfigList(Lists.newArrayList(driverConfig));
return dbConfig;

2
chat2db-server/chat2db-plugins/chat2db-redis/src/main/java/ai/chat2db/plugin/redis/builder/DBConfigBuilder.java
View File

@ -12,7 +12,7 @@ public class DBConfigBuilder {
DriverConfig driverConfig = new DriverConfig();
driverConfig.setJdbcDriver("redis-jdbc-driver-1.3.jar");
driverConfig.setJdbcDriverClass("jdbc.RedisDriver");
driverConfig.setDownloadJdbcDriverUrls(Lists.newArrayList("https://oss-chat2db.alibaba.com/lib/redis-jdbc-driver-1.3.jar"));
driverConfig.setDownloadJdbcDriverUrls(Lists.newArrayList("https://oss.sqlgpt.cn/lib/redis-jdbc-driver-1.3.jar"));
dbConfig.setDefaultDriverConfig(driverConfig);
dbConfig.setDriverConfigList(Lists.newArrayList(driverConfig));
return dbConfig;

2
chat2db-server/chat2db-plugins/chat2db-sqlite/src/main/java/ai/chat2db/plugin/sqlite/builder/DBConfigBuilder.java
View File

@ -13,7 +13,7 @@ public class DBConfigBuilder {
DriverConfig driverConfig = new DriverConfig();
driverConfig.setJdbcDriver("sqlite-jdbc-3.39.3.0.jar");
driverConfig.setJdbcDriverClass("org.sqlite.JDBC");
driverConfig.setDownloadJdbcDriverUrls(Lists.newArrayList("https://oss-chat2db.alibaba.com/lib/sqlite-jdbc-3.39.3.0.jar"));
driverConfig.setDownloadJdbcDriverUrls(Lists.newArrayList("https://oss.sqlgpt.cn/lib/sqlite-jdbc-3.39.3.0.jar"));
dbConfig.setDefaultDriverConfig(driverConfig);
dbConfig.setDriverConfigList(Lists.newArrayList(driverConfig));
return dbConfig;

2
chat2db-server/chat2db-plugins/chat2db-sqlite/src/main/java/ai/chat2db/plugin/sqlite/builder/SqliteBuilder.java
View File

@ -78,6 +78,6 @@ public class SqliteBuilder extends DefaultSqlBuilder implements SqlBuilder {
@Override
public String pageLimit(String sql, int offset, int pageNo, int pageSize) {
return "select * from(" + sql + ") t LIMIT " + pageNo + " OFFSET " + offset + "";
return "select * from(" + sql + ") t LIMIT " + pageSize + " OFFSET " + offset + "";
}
}

2
chat2db-server/chat2db-plugins/chat2db-sqlserver/src/main/java/ai/chat2db/plugin/sqlserver/builder/SqlServerDBConfigBuilder.java
View File

@ -13,7 +13,7 @@ public class SqlServerDBConfigBuilder {
DriverConfig driverConfig = new DriverConfig();
driverConfig.setJdbcDriver("mssql-jdbc-11.2.1.jre17.jar");
driverConfig.setJdbcDriverClass("com.microsoft.sqlserver.jdbc.SQLServerDriver");
driverConfig.setDownloadJdbcDriverUrls(Lists.newArrayList("https://oss-chat2db.alibaba.com/lib/mssql-jdbc-11.2.1.jre17.jar"));
driverConfig.setDownloadJdbcDriverUrls(Lists.newArrayList("https://oss.sqlgpt.cn/lib/mssql-jdbc-11.2.1.jre17.jar"));
dbConfig.setDefaultDriverConfig(driverConfig);
dbConfig.setDriverConfigList(Lists.newArrayList(driverConfig));
return dbConfig;

2
chat2db-server/chat2db-spi/src/main/java/ai/chat2db/spi/util/JdbcJarUtils.java
View File

@ -133,7 +133,7 @@ public class JdbcJarUtils {
return path;
}
public static final String DOWNLOAD_URL_HOST = "https://oss-chat2db.alibaba.com/lib/";
public static final String DOWNLOAD_URL_HOST = "https://oss.sqlgpt.cn/lib/";
private static String getDownloadUrl(String jarPath) {
return DOWNLOAD_URL_HOST+jarPath;
}

14
chat2db-server/chat2db-spi/src/main/java/ai/chat2db/spi/util/SortUtils.java
View File

@ -7,6 +7,7 @@ import org.apache.commons.lang3.StringUtils;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
@ -18,19 +19,20 @@ public class SortUtils {
if (CollectionUtils.isEmpty(databases)) {
return databases;
}
List<Database> databaseList = new ArrayList<>();
List<Database> systemDatabases = databases.stream()
.filter(database -> list.contains(database.getName())).collect(Collectors.toList());
List<Database> userDatabases = databases.stream()
.filter(database -> !list.contains(database.getName())).collect(Collectors.toList());
if (CollectionUtils.isEmpty(userDatabases)) {
return databases;
databaseList = databases;
}else if (CollectionUtils.isEmpty(systemDatabases)) {
databaseList = userDatabases;
}else {
databaseList = Stream.concat(userDatabases.stream(), systemDatabases.stream())
.collect(Collectors.toList());
}
if (CollectionUtils.isEmpty(systemDatabases)) {
return userDatabases;
}
List<Database> databaseList = Stream.concat(userDatabases.stream(), systemDatabases.stream())
.collect(Collectors.toList());
// If the database name contains the name of the current database, the current database is placed in the first place
String ulr;