QRunIO/qqq
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq.git synced 2025-07-18 05:01:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

CE-936 - Fix anti-merge commit from previous

Browse Source
This commit is contained in:
darin.kelkhoff
2024-03-12 12:09:24 -05:00
parent c054bf5ddd
commit 3684101259
1 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
qqq-backend-module-rdbms/src/main/java/com/kingsrook/qqq/backend/module/rdbms/jdbc/ConnectionManager.java
View File

@ -40,7 +40,6 @@ public class ConnectionManager
*******************************************************************************/ *******************************************************************************/
public Connection getConnection(RDBMSBackendMetaData backend) throws SQLException public Connection getConnection(RDBMSBackendMetaData backend) throws SQLException
{ {
String jdbcURL;
String jdbcURL = getJdbcUrl(backend); String jdbcURL = getJdbcUrl(backend);
return DriverManager.getConnection(jdbcURL, backend.getUsername(), backend.getPassword()); return DriverManager.getConnection(jdbcURL, backend.getUsername(), backend.getPassword());
} }
@ -74,23 +73,8 @@ public class ConnectionManager
{ {
if(StringUtils.hasContent(backend.getJdbcUrl())) if(StringUtils.hasContent(backend.getJdbcUrl()))
{ {
jdbcURL = backend.getJdbcUrl();
return backend.getJdbcUrl(); return backend.getJdbcUrl();
} }
else
{
switch(backend.getVendor())
{
// TODO aws-mysql-jdbc driver not working when running on AWS
// jdbcURL = "jdbc:mysql:aws://" + backend.getHostName() + ":" + backend.getPort() + "/" + backend.getDatabaseName() + "?rewriteBatchedStatements=true&zeroDateTimeBehavior=CONVERT_TO_NULL";
case "aurora" -> jdbcURL = "jdbc:mysql://" + backend.getHostName() + ":" + backend.getPort() + "/" + backend.getDatabaseName() + "?rewriteBatchedStatements=true&zeroDateTimeBehavior=convertToNull&useSSL=false";
case "mysql" -> jdbcURL = "jdbc:mysql://" + backend.getHostName() + ":" + backend.getPort() + "/" + backend.getDatabaseName() + "?rewriteBatchedStatements=true&zeroDateTimeBehavior=convertToNull";
case "h2" -> jdbcURL = "jdbc:h2:" + backend.getHostName() + ":" + backend.getDatabaseName() + ";MODE=MySQL;DB_CLOSE_DELAY=-1";
default -> throw new IllegalArgumentException("Unsupported rdbms backend vendor: " + backend.getVendor());
}
}
return DriverManager.getConnection(jdbcURL, backend.getUsername(), backend.getPassword());
return switch(backend.getVendor()) return switch(backend.getVendor())
{ {