Skip to content

fix(sundb): escape SQL identifiers and literals in metadata/DDL paths (#1914) #2176

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

Merged
openai0229 merged 8 commits into from
Jul 29, 2026
Merged

fix(sundb): escape SQL identifiers and literals in metadata/DDL paths (#1914) #2176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
66c8c25
fix(sundb): escape SQL identifiers and literals in metadata/DDL paths…
HandSonic Jul 26, 2026
a224ad9
fix(sundb): tighten DEFAULT pattern and escape second-order DDL metad…
HandSonic Jul 26, 2026
120420c
fix(sundb): allow quoted string-literal DEFAULTs, keep DDL-reshape re…
HandSonic Jul 26, 2026
27e1557
fix(sundb): accept typed date/time literals in DEFAULT pattern (#1914)
HandSonic Jul 26, 2026
8770832
refactor(sundb): move escaping into SUNDBIdentifierProcessor per main…
HandSonic Jul 26, 2026
b516ac7
fix(sundb): keep SPI quoteIdentifier conditional, reserve always-quot…
HandSonic Jul 26, 2026
d8f6cd3
fix(sundb): complete identifier and DDL hardening
openai0229 Jul 29, 2026
c62f205
fix(sundb): close final DDL guard gaps
openai0229 Jul 29, 2026
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
24 changes: 14 additions & 10 deletions ...plugins/chat2db-community-sundb/src/main/java/ai/chat2db/plugin/sundb/SUNDBDBManager.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.*;

import ai.chat2db.spi.IDbManager;
import ai.chat2db.plugin.sundb.identifier.SUNDBIdentifierProcessor;
import ai.chat2db.spi.DefaultDBManager;
import ai.chat2db.community.domain.api.model.async.AsyncContext;
import ai.chat2db.spi.sql.Chat2DBContext;
Expand All @@ -22,7 +23,7 @@ public class SUNDBDBManager extends DefaultDBManager implements IDbManager {


private String format(String tableName) {
return "\"" + tableName + "\"";
return SUNDBIdentifierProcessor.INSTANCE.quoteIdentifierAlways(tableName);
}


Expand All @@ -45,7 +46,7 @@ public void exportDatabase(Connection connection, String databaseName, String sc
}

private void exportTables(Connection connection, String schemaName, AsyncContext asyncContext) throws SQLException {
String sql =String.format(SQL_SELECT_TABLE_NAME_ALL_TABLES, schemaName);
String sql =String.format(SQL_SELECT_TABLE_NAME_ALL_TABLES, SUNDBIdentifierProcessor.INSTANCE.escapeString(schemaName));
try (PreparedStatement preparedStatement = connection.prepareStatement(sql); ResultSet resultSet = preparedStatement.executeQuery()) {
while (resultSet.next()) {
String tableName = resultSet.getString("TABLE_NAME");
Expand All @@ -62,13 +63,13 @@ private void exportTable(Connection connection, String tableName, String schemaN

private void exportTableColumnComment(Connection connection, String schemaName, String tableName, StringBuilder sqlBuilder) throws SQLException {
String sql =String.format(SQL_SELECT_COLNAME_COMMENT_SYS_SYSCOLUMNCOMMENTS +
"where SCHNAME = '%s' and TVNAME = '%s'and TABLE_TYPE = 'TABLE';", schemaName,tableName);
"where SCHNAME = '%s' and TVNAME = '%s'and TABLE_TYPE = 'TABLE';", SUNDBIdentifierProcessor.INSTANCE.escapeString(schemaName), SUNDBIdentifierProcessor.INSTANCE.escapeString(tableName));
try (PreparedStatement preparedStatement = connection.prepareStatement(sql); ResultSet resultSet = preparedStatement.executeQuery()) {
while (resultSet.next()) {
String columnName = resultSet.getString("COLNAME");
String comment = resultSet.getString("COMMENT$");
sqlBuilder.append(SQL_COMMENT_COLUMN).append(format(schemaName)).append(".").append(format(tableName))
.append(".").append(format(columnName)).append(" IS ").append("'").append(comment).append("';").append("\n");
.append(".").append(format(columnName)).append(" IS ").append("'").append(SUNDBIdentifierProcessor.INSTANCE.escapeString(comment)).append("';").append("\n");
}
}
}
Expand Down Expand Up @@ -98,7 +99,7 @@ private void exportProcedures(Connection connection, String schemaName, AsyncCon
}

private void exportProcedure(Connection connection, String schemaName, String procedureName, AsyncContext asyncContext) throws SQLException {
String sql = String.format(ROUTINES_SQL,"PROC", schemaName,procedureName);
String sql = String.format(ROUTINES_SQL,"PROC", SUNDBIdentifierProcessor.INSTANCE.escapeString(schemaName), SUNDBIdentifierProcessor.INSTANCE.escapeString(procedureName));
try (PreparedStatement statement = connection.prepareStatement(sql); ResultSet resultSet = statement.executeQuery()) {
if (resultSet.next()) {
StringBuilder sqlBuilder = new StringBuilder();
Expand All @@ -114,7 +115,7 @@ private void exportTriggers(Connection connection, String schemaName, AsyncConte
}

private void exportTrigger(Connection connection, String schemaName, String triggerName, StringBuilder sqlBuilder) throws SQLException {
String sql = String.format(TRIGGER_SQL, schemaName,triggerName);
String sql = String.format(TRIGGER_SQL, SUNDBIdentifierProcessor.INSTANCE.escapeString(schemaName), SUNDBIdentifierProcessor.INSTANCE.escapeString(triggerName));
try (PreparedStatement preparedStatement = connection.prepareStatement(sql); ResultSet resultSet = preparedStatement.executeQuery()) {
if (resultSet.next()) {
sqlBuilder.append(resultSet.getString("TRIGGER_BODY")).append("\n");
Expand All @@ -130,24 +131,27 @@ public void connectDatabase(Connection connection, String database) {
}
String schemaName = connectInfo.getSchemaName();
try {
DefaultSQLExecutor.getInstance().execute(connection, String.format(SQL_SET_SCHEMA, schemaName));
DefaultSQLExecutor.getInstance().execute(connection,
String.format(SQL_SET_SCHEMA, SUNDBIdentifierProcessor.INSTANCE.quoteIdentifierAlways(schemaName)));
} catch (SQLException e) {
e.printStackTrace();
}
}

@Override
public String dropTable(Connection connection, String databaseName, String schemaName, String tableName) {
return String.format(SQL_DROP_TABLE_EXISTS, schemaName, tableName);
return String.format(SQL_DROP_TABLE_EXISTS,
SUNDBIdentifierProcessor.INSTANCE.quoteIdentifierAlways(schemaName),
SUNDBIdentifierProcessor.INSTANCE.quoteIdentifierAlways(tableName));
}

@Override
public void copyTable(Connection connection, String databaseName, String schemaName, String tableName, String newTableName,boolean copyData) throws SQLException {
String sql;
if(copyData){
sql = String.format(SQL_COPY_TABLE_DATA, newTableName, tableName);
sql = String.format(SQL_COPY_TABLE_DATA, SUNDBIdentifierProcessor.INSTANCE.quoteIdentifierAlways(newTableName), SUNDBIdentifierProcessor.INSTANCE.quoteIdentifierAlways(tableName));
}else {
sql = String.format(SQL_COPY_TABLE_STRUCTURE, newTableName, tableName);
sql = String.format(SQL_COPY_TABLE_STRUCTURE, SUNDBIdentifierProcessor.INSTANCE.quoteIdentifierAlways(newTableName), SUNDBIdentifierProcessor.INSTANCE.quoteIdentifierAlways(tableName));
}
DefaultSQLExecutor.getInstance().execute(connection, sql, resultSet -> null);
}
Expand Down
Loading
Loading