Skip to content

Quote PostgreSQL schema/table identifiers in metadata-derived SQL names #948

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
grabdoc merged 5 commits into from
Sep 2, 2026
Merged

Quote PostgreSQL schema/table identifiers in metadata-derived SQL names #948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b0963dc
Initial plan
Copilot May 24, 2026
3b295b6
fix: quote PostgreSQL schema and table in generated full table name
Copilot May 24, 2026
74e36e1
test: align PostgreSQLDataExclusion test variable naming
Copilot May 24, 2026
c78a73c
test: add unicode identifier coverage for PostgreSQL fullName quoting
Copilot May 24, 2026
fc898d0
Merge branch 'master' into copilot/fix-trailing-junk-error-in-query
grabdoc Sep 2, 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
8 changes: 7 additions & 1 deletion ...core/rdbms-support/src/main/java/com/homihq/db2rest/jdbc/sql/PostgreSQLDataExclusion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,12 +110,18 @@ private DbTable getDbTable(DatabaseMetaData databaseMetaData, MetaDataTable meta
String schemaName = StringUtils.isNotBlank(metaDataTable.schema())
? metaDataTable.schema() : metaDataTable.catalog();

String quotedFullName = getQuotedName(schemaName) + "." + getQuotedName(metaDataTable.tableName());

return new DbTable(
schemaName, metaDataTable.tableName(),
schemaName + "." + metaDataTable.tableName(),
quotedFullName,
metaDataTable.tableAlias(), columns, metaDataTable.tableType(), "\"");
} catch (SQLException e) {
throw new RuntimeException(e);
}
}

private String getQuotedName(String name) {
return "\"" + name.replace("\"", "\"\"") + "\"";
}
}
100 changes: 100 additions & 0 deletions .../rdbms-support/src/test/java/com/homihq/db2rest/jdbc/sql/PostgreSQLDataExclusionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
package com.homihq.db2rest.jdbc.sql;

import com.db2rest.jdbc.dialect.model.DbTable;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;

import java.sql.DatabaseMetaData;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.List;

import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.when;

@ExtendWith(MockitoExtension.class)
class PostgreSQLDataExclusionTest {

@Mock
private DatabaseMetaData databaseMetaData;

@Mock
private ResultSet tablesResultSet;

@Mock
private ResultSet primaryKeysResultSet;

@Mock
private ResultSet columnsResultSet;

@Test
void shouldQuoteSchemaAndTableNameInFullName() throws SQLException {
PostgreSQLDataExclusion dataExclusion = new PostgreSQLDataExclusion();
String schemaName = "0HEM8B0GQNB5M";
String tableName = "t_region";

when(databaseMetaData.getTables(isNull(), eq(schemaName), isNull(), any(String[].class)))
.thenReturn(tablesResultSet);
when(tablesResultSet.next()).thenReturn(true, false);
when(tablesResultSet.getString(ColumnLabel.TABLE_NAME.name())).thenReturn(tableName);
when(tablesResultSet.getString(ColumnLabel.TABLE_CAT.name())).thenReturn(null);
when(tablesResultSet.getString(ColumnLabel.TABLE_SCHEM.name())).thenReturn(schemaName);
when(tablesResultSet.getString(ColumnLabel.TABLE_TYPE.name())).thenReturn("TABLE");

when(databaseMetaData.getPrimaryKeys(isNull(), eq(schemaName), eq(tableName)))
.thenReturn(primaryKeysResultSet);
when(primaryKeysResultSet.next()).thenReturn(false);

when(databaseMetaData.getColumns(isNull(), eq(schemaName), eq(tableName), isNull()))
.thenReturn(columnsResultSet);
when(columnsResultSet.next()).thenReturn(true, false);
when(columnsResultSet.getString(ColumnLabel.COLUMN_NAME.name())).thenReturn("id");
when(columnsResultSet.getInt(ColumnLabel.DATA_TYPE.name())).thenReturn(4);
when(columnsResultSet.getString(ColumnLabel.IS_AUTOINCREMENT.name())).thenReturn("NO");
when(columnsResultSet.getString(ColumnLabel.TYPE_NAME.name())).thenReturn("int4");

List<DbTable> dbTables = dataExclusion.getTables(databaseMetaData, false, List.of(schemaName));

assertThat(dbTables).singleElement()
.extracting(DbTable::fullName)
.isEqualTo("\"0HEM8B0GQNB5M\".\"t_region\"");
}

@Test
void shouldQuoteUnicodeSchemaAndTableNameInFullName() throws SQLException {
PostgreSQLDataExclusion dataExclusion = new PostgreSQLDataExclusion();
String schemaName = "dátá_数据";
String tableName = "dátá";

when(databaseMetaData.getTables(isNull(), eq(schemaName), isNull(), any(String[].class)))
.thenReturn(tablesResultSet);
when(tablesResultSet.next()).thenReturn(true, false);
when(tablesResultSet.getString(ColumnLabel.TABLE_NAME.name())).thenReturn(tableName);
when(tablesResultSet.getString(ColumnLabel.TABLE_CAT.name())).thenReturn(null);
when(tablesResultSet.getString(ColumnLabel.TABLE_SCHEM.name())).thenReturn(schemaName);
when(tablesResultSet.getString(ColumnLabel.TABLE_TYPE.name())).thenReturn("TABLE");

when(databaseMetaData.getPrimaryKeys(isNull(), eq(schemaName), eq(tableName)))
.thenReturn(primaryKeysResultSet);
when(primaryKeysResultSet.next()).thenReturn(false);

when(databaseMetaData.getColumns(isNull(), eq(schemaName), eq(tableName), isNull()))
.thenReturn(columnsResultSet);
when(columnsResultSet.next()).thenReturn(true, false);
when(columnsResultSet.getString(ColumnLabel.COLUMN_NAME.name())).thenReturn("id");
when(columnsResultSet.getInt(ColumnLabel.DATA_TYPE.name())).thenReturn(4);
when(columnsResultSet.getString(ColumnLabel.IS_AUTOINCREMENT.name())).thenReturn("NO");
when(columnsResultSet.getString(ColumnLabel.TYPE_NAME.name())).thenReturn("int4");

List<DbTable> dbTables = dataExclusion.getTables(databaseMetaData, false, List.of(schemaName));

assertThat(dbTables).singleElement()
.extracting(DbTable::fullName)
.isEqualTo("\"dátá_数据\".\"dátá\"");
}
}
Loading