Skip to content

Solve the problem that dev cannot start #1666

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

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Solve the problem that dev cannot start #1666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...b-clickhouse/src/main/java/ai/chat2db/plugin/clickhouse/builder/ClickHouseSqlBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@

import ai.chat2db.plugin.clickhouse.type.ClickHouseColumnTypeEnum;
import ai.chat2db.plugin.clickhouse.type.ClickHouseIndexTypeEnum;
import ai.chat2db.spi.SqlBuilder;
import ai.chat2db.spi.jdbc.DefaultSqlBuilder;
import ai.chat2db.spi.model.Database;
import ai.chat2db.spi.model.Table;
import ai.chat2db.spi.model.TableColumn;
import ai.chat2db.spi.model.TableIndex;
import org.apache.commons.lang3.StringUtils;

import java.util.List;


public class ClickHouseSqlBuilder extends DefaultSqlBuilder {
@Override
Expand Down
1 change: 1 addition & 0 deletions chat2db-server/chat2db-plugins/chat2db-h2/src/main/java/ai/chat2db/plugin/h2/H2Meta.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.util.*;
import java.util.stream.Collectors;

Expand Down
2 changes: 2 additions & 0 deletions ...2db-plugins/chat2db-hive/src/main/java/ai/chat2db/plugin/hive/builder/HiveSqlBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@

import ai.chat2db.plugin.hive.type.HiveColumnTypeEnum;
import ai.chat2db.plugin.hive.type.HiveIndexTypeEnum;
import ai.chat2db.spi.SqlBuilder;
import ai.chat2db.spi.jdbc.DefaultSqlBuilder;
import ai.chat2db.spi.model.Database;
import ai.chat2db.spi.model.Table;
import ai.chat2db.spi.model.TableColumn;
import ai.chat2db.spi.model.TableIndex;
import org.apache.commons.lang3.StringUtils;

import java.util.List;


public class HiveSqlBuilder extends DefaultSqlBuilder implements SqlBuilder<Table> {
Expand Down
4 changes: 0 additions & 4 deletions ...rver-web-api/src/main/java/ai/chat2db/server/web/api/controller/rdb/RdbDmlController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,17 +129,13 @@ public DataResult<String> getUpdateSelectResultSql(@RequestBody SelectResultUpda

@RequestMapping(value = "/get_group_by_sql", method = {RequestMethod.POST, RequestMethod.PUT})
public DataResult<String> getGroupBySql(@RequestBody GroupByRequest request) {

GroupByParam param = rdbWebConverter.request2param(request);

return dlTemplateService.getGroupBySql(param);
}

@RequestMapping(value = "/get_order_by_sql", method = {RequestMethod.POST, RequestMethod.PUT})
public DataResult<String> getOrderBySql(@RequestBody OrderByRequest request) {

OrderByParam param = rdbWebConverter.request2param(request);

return dlTemplateService.getOrderBySql(param);
}

Expand Down
8 changes: 8 additions & 0 deletions ...api/src/main/java/ai/chat2db/server/web/api/controller/rdb/converter/RdbWebConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,14 @@ public abstract class RdbWebConverter {
*/
public abstract OrderByParam request2param(OrderByRequest request);

/**
* Parameter conversion
*
* @param request
* @return
*/
public abstract GroupByParam request2param(GroupByRequest request);

/**
* Parameter conversion
*
Expand Down