Skip to content

feat: add get database name #343

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

Draft
hi-kbys wants to merge 7 commits into
base: master
Choose a base branch
from
Draft

feat: add get database name #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9aa96ac
feat: add get database name
hi-kbys Jun 4, 2024
07af87c
remove comment
hi-kbys Jun 4, 2024
97caed5
temp: throw error
hi-kbys Jun 4, 2024
79d2e95
temp: remove return stmt
hi-kbys Jun 4, 2024
9f29dc3
add nullDatabaseMeansCurrent=true
hi-kbys Jun 4, 2024
92b81b5
change nullCatalogMeansCurrent options
hi-kbys Jun 4, 2024
88b6964
remove debug log
hi-kbys Jun 4, 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
2 changes: 1 addition & 1 deletion embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/AbstractJdbcOutputPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,7 +583,7 @@ protected void doBegin(JdbcOutputConnection con,
}
}
}
task.setActualTable(new TableIdentifier(null, con.getSchemaName(), actualTable));
task.setActualTable(new TableIdentifier(con.getDatabaseName(), con.getSchemaName(), actualTable));

Optional<JdbcSchema> initialTargetTableSchema =
mode.ignoreTargetTableSchema() ?
Expand Down
5 changes: 5 additions & 0 deletions embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/JdbcOutputConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,11 @@ public void close() throws SQLException
}
}

public String getDatabaseName() throws SQLException
{
return connection.getCatalog();
}

public String getSchemaName()
{
return schemaName;
Expand Down
2 changes: 2 additions & 0 deletions embulk-output-mysql/src/main/java/org/embulk/output/MySQLOutputPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ protected JdbcOutputConnector getConnector(PluginTask task, boolean retryableMet
props.setProperty("connectTimeout", "300000"); // milliseconds
props.setProperty("socketTimeout", "1800000"); // smillieconds

props.setProperty("nullCatalogMeansCurrent", "false");

// Enable keepalive based on tcp_keepalive_time, tcp_keepalive_intvl and tcp_keepalive_probes kernel parameters.
// Socket options TCP_KEEPCNT, TCP_KEEPIDLE, and TCP_KEEPINTVL are not configurable.
props.setProperty("tcpKeepAlive", "true");
Expand Down