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

fix: listing table and columns were executed with null category because it specify database name instead of category name. #11

Merged
merged 2 commits into from
Oct 24, 2024
Merged

fix: listing table and columns were executed with null category because it specify database name instead of category name. #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8839d8
fix: listing table and columns were executed with null category becau…
yas-okadatech Oct 24, 2024
ff237d8
add cooment
yas-okadatech Oct 24, 2024
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
5 changes: 3 additions & 2 deletions src/main/java/org/embulk/output/DatabricksOutputPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,11 +180,12 @@ public Optional<JdbcSchema> newJdbcSchemaFromTableIfExists(
return Optional.empty();
}

DatabricksOutputConnection conn = (DatabricksOutputConnection) connection;
DatabaseMetaData dbm = connection.getMetaData();
String escape = dbm.getSearchStringEscape();

ResultSet rs =
dbm.getPrimaryKeys(table.getDatabase(), table.getSchemaName(), table.getTableName());
dbm.getPrimaryKeys(conn.getCatalogName(), table.getSchemaName(), table.getTableName());
final HashSet<String> primaryKeysBuilder = new HashSet<>();
try {
while (rs.next()) {
Expand All @@ -207,7 +208,7 @@ public Optional<JdbcSchema> newJdbcSchemaFromTableIfExists(
// https://docs.databricks.com/en/sql/language-manual/data-types/timestamp-ntz-type.html#notes
rs =
dbm.getColumns(
JdbcUtils.escapeSearchString(table.getDatabase(), escape),
JdbcUtils.escapeSearchString(conn.getCatalogName(), escape),
JdbcUtils.escapeSearchString(table.getSchemaName(), escape),
JdbcUtils.escapeSearchString(table.getTableName(), escape),
null);
Expand Down
10 changes: 9 additions & 1 deletion src/main/java/org/embulk/output/databricks/DatabricksOutputConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public boolean tableExists(TableIdentifier table) throws SQLException {
try (ResultSet rs =
connection
.getMetaData()
.getTables(table.getDatabase(), table.getSchemaName(), table.getTableName(), null)) {
.getTables(catalogName, table.getSchemaName(), table.getTableName(), null)) {
while (rs.next()) {
if (isAvailableTableMetadataInConnection(rs, table)) {
return true;
Expand All @@ -62,6 +62,10 @@ public boolean isAvailableTableMetadataInConnection(ResultSet rs, TableIdentifie
// null
// and one Databricks connection has multiple available catalogs　(databases).

// NOTE: maybe this logic is not necessary anymore after this PR:
// https://github.com/trocco-io/embulk-output-databricks/pull/11
// But I'm not sure, so I'll keep it for now.

if (tableIdentifier.getDatabase() == null) {
logger.trace("tableIdentifier.getDatabase() == null, check by instance variable");
if (!rs.getString("TABLE_CAT").equalsIgnoreCase(catalogName)) {
Expand Down Expand Up @@ -295,4 +299,8 @@ private String buildColumns(JdbcSchema schema, String prefix) {
}
return sb.toString();
}

public String getCatalogName() {
return catalogName;
}
}
Loading