moparisthebest
/
JdbcMapper
mirror of https://github.com/moparisthebest/JdbcMapper
1
0
Fork 0
Code Issues Releases Wiki Activity

Manually load drivers pre-java8

This commit is contained in:
Travis Burtrum 2018-05-15 07:24:57 -04:00
parent ca4c827788
commit 292cce2533
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/src/test/java/com/moparisthebest/jdbc/QueryMapperTest.java
View File

@ -83,12 +83,23 @@ public class QueryMapperTest {
} else { } else {
jUrls.add(jdbcUrl); jUrls.add(jdbcUrl);
} }
for(final String extraJdbcUrlProp : new String[]{"postgresqlJdbcUrl", "mariadbJdbcUrl", "mysqlJdbcUrl"}) { for(int x = 1; ; ++x) {
final String extrajdbcUrl = System.getProperty(extraJdbcUrlProp); final String extrajdbcUrl = System.getProperty("jdbcUrl" + x);
if(extrajdbcUrl != null) if(extrajdbcUrl != null)
jUrls.add(extrajdbcUrl); jUrls.add(extrajdbcUrl);
else
break;
} }
jdbcUrls = Collections.unmodifiableCollection(jUrls); jdbcUrls = Collections.unmodifiableCollection(jUrls);
/*IFJAVA6_START
// this seems to only be needed for java <8
for(final String driverClass : new String[]{"org.hsqldb.jdbc.JDBCDriver", "org.h2.Driver"})
try {
Class.forName(driverClass);
} catch(Exception e) {
// ignore, any real errors will be caught during test running
}
IFJAVA6_END*/
} }
public static void insertPerson(final QueryMapper qm, final Person person) throws SQLException { public static void insertPerson(final QueryMapper qm, final Person person) throws SQLException {
@ -100,7 +111,6 @@ public class QueryMapperTest {
} }
public static Connection getConnection(final String url) throws SQLException { public static Connection getConnection(final String url) throws SQLException {
// don't need Class.forName("org.apache.derby.jdbc.EmbeddedDriver").newInstance(); anymore?
final Connection conn = DriverManager.getConnection(url); final Connection conn = DriverManager.getConnection(url);
QueryMapper qm = null; QueryMapper qm = null;
try { try {