Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

The database type is judged by enumeration. #871

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

The database type is judged by enumeration. #871

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
59f39ab
修改拼写错误
tmlx1990 Nov 21, 2023
37306c5
修改SCHEMA拼写错误
tmlx1990 Nov 21, 2023
c674d25
数据库类型使用枚举进行判断
tmlx1990 Nov 21, 2023
10ea571
Merge remote-tracking branch 'origin/main' into main
tmlx1990 Nov 21, 2023
218662a
恢复代码
tmlx1990 Nov 21, 2023
4a51852
恢复代码
tmlx1990 Nov 21, 2023
df0b417
数据库类型使用枚举进行判断
tmlx1990 Nov 21, 2023
a4f063c
Merge remote-tracking branch 'origin/main' into main
tmlx1990 Nov 21, 2023
7b043cd
数据库类型使用枚举进行判断
tmlx1990 Nov 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions chat2db-server/chat2db-spi/src/main/java/ai/chat2db/spi/sql/SQLExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package ai.chat2db.spi.sql;

import ai.chat2db.server.tools.base.constant.EasyToolsConstant;
import ai.chat2db.server.tools.base.enums.DataSourceTypeEnum;
import ai.chat2db.server.tools.common.util.I18nUtils;
import ai.chat2db.spi.ValueHandler;
import ai.chat2db.spi.jdbc.DefaultValueHandler;
Expand Down Expand Up @@ -203,7 +204,8 @@ public ExecuteResult execute(final String sql, Connection connection, boolean li
// 获取header信息
List<Header> headerList = Lists.newArrayListWithExpectedSize(col);
executeResult.setHeaderList(headerList);
int chat2dbAutoRowIdIndex = -1;// chat2db自动生成的行分页ID
// chat2db自动生成的行分页ID
int chat2dbAutoRowIdIndex = -1;

for (int i = 1; i <= col; i++) {
String name = ResultSetUtils.getColumnName(resultSetMetaData, i);
Expand Down Expand Up @@ -344,7 +346,7 @@ public List<Table> tables(Connection connection, String databaseName, String sch
ResultSet resultSet = metadata.getTables(databaseName, schemaName, tableName,
types);
// 如果connection为mysql
if ("MySQL".equalsIgnoreCase(metadata.getDatabaseProductName())) {
if (DataSourceTypeEnum.MYSQL.getCode().equalsIgnoreCase(metadata.getDatabaseProductName())) {
// 获取mysql表的comment
List<Table> tables = ResultSetUtils.toObjectList(resultSet, Table.class);
if (CollectionUtils.isNotEmpty(tables)) {
Expand Down