Skip to content

don't set driver-class-name except for mariadb driver #58

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

Closed
wants to merge 1 commit into from
Closed

don't set driver-class-name except for mariadb driver #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion ...boot/src/main/java/io/pivotal/cfenv/spring/boot/CfDataSourceEnvironmentPostProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@

/**
* @author Mark Pollack
* @author Thomas Risberg
*/
public class CfDataSourceEnvironmentPostProcessor implements EnvironmentPostProcessor,
Ordered, ApplicationListener<ApplicationEvent> {
Expand Down Expand Up @@ -80,7 +81,7 @@ public void postProcessEnvironment(ConfigurableEnvironment environment,
properties.put("spring.datasource.username", cfJdbcService.getUsername());
properties.put("spring.datasource.password", cfJdbcService.getPassword());
Object driverClassName = cfJdbcService.getDriverClassName();
if (driverClassName != null) {
if (driverClassName != null && ((String)driverClassName).startsWith("org.mariadb.jdbc")) {
properties.put("spring.datasource.driver-class-name", driverClassName);
}

Expand Down
5 changes: 3 additions & 2 deletions java-cfenv-jdbc/src/main/java/io/pivotal/cfenv/jdbc/MySqlJdbcUrlCreator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

/**
* @author Mark Pollack
* @author Thomas Risberg
*/
public class MySqlJdbcUrlCreator extends AbstractJdbcUrlCreator {

Expand All @@ -46,11 +47,11 @@ public boolean isDatabaseService(CfService cfService) {
public String getDriverClassName() {
String driverClassNameToUse = null;
try {
driverClassNameToUse = "org.mariadb.jdbc.Driver";
driverClassNameToUse = "com.mysql.cj.jdbc.Driver";
Class.forName(driverClassNameToUse, false, getClass().getClassLoader());
} catch (ClassNotFoundException e) {
try {
driverClassNameToUse = "com.mysql.cj.jdbc.Driver";
driverClassNameToUse = "org.mariadb.jdbc.Driver";
Class.forName(driverClassNameToUse, false, getClass().getClassLoader());
} catch (ClassNotFoundException e2) {
return null;
Expand Down