Skip to content

fix: use schemaName as fallback for databaseName in Hive DDL/columns/view queries #1818

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
octo-patch wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: use schemaName as fallback for databaseName in Hive DDL/columns/view queries #1818

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
12 changes: 9 additions & 3 deletions ...erver/chat2db-plugins/chat2db-hive/src/main/java/ai/chat2db/plugin/hive/HiveMetaData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ public List<Schema> schemas(Connection connection, String databaseName) {
@Override
public String tableDDL(Connection connection, @NotEmpty String databaseName, String schemaName,
@NotEmpty String tableName) {
String sql = "SHOW CREATE TABLE " + format(databaseName) + "."
// In Hive, schema and database are the same concept. Fall back to schemaName when databaseName is absent.
String effectiveDb = StringUtils.isNotBlank(databaseName) ? databaseName : schemaName;
String sql = "SHOW CREATE TABLE " + format(effectiveDb) + "."
+ format(tableName);
return SQLExecutor.getInstance().execute(connection, sql, resultSet -> {
StringBuilder sb = new StringBuilder();
Expand Down Expand Up @@ -97,7 +99,9 @@ public SqlBuilder getSqlBuilder() {
// TODO 待完善
@Override
public List<TableColumn> columns(Connection connection, String databaseName, String schemaName, String tableName) {
String sql = String.format(SELECT_TAB_COLS, databaseName, tableName);
// In Hive, schema and database are the same concept. Fall back to schemaName when databaseName is absent.
String effectiveDb = StringUtils.isNotBlank(databaseName) ? databaseName : schemaName;
String sql = String.format(SELECT_TAB_COLS, effectiveDb, tableName);
return SQLExecutor.getInstance().execute(connection, sql, resultSet -> {
List<TableColumn> tableColumns = new ArrayList<>();
Map<String, String> detailTableInfo = new HashMap<>();
Expand Down Expand Up @@ -268,7 +272,9 @@ public static String format(String name) {

@Override
public Table view(Connection connection, String databaseName, String schemaName, String viewName) {
String sql = String.format(VIEW_SQL, databaseName, viewName);
// In Hive, schema and database are the same concept. Fall back to schemaName when databaseName is absent.
String effectiveDb = StringUtils.isNotBlank(databaseName) ? databaseName : schemaName;
String sql = String.format(VIEW_SQL, effectiveDb, viewName);
return SQLExecutor.getInstance().execute(connection, sql, resultSet -> {
Table table = new Table();
table.setDatabaseName(databaseName);
Expand Down