rudi/MTGClone
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Cleaned up tryConnect()

Browse Source
This commit is contained in:
Gregory Rudolph
2020-10-15 09:20:03 -04:00
parent 2bf41d6d12
commit 3d3305be64
1 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/MTGClone/SQLDriver.java
View File

@ -15,30 +15,21 @@ public class SQLDriver {
StackTraceElement ste = stacktrace[3]; StackTraceElement ste = stacktrace[3];
// If it's a controller, we're running in servlet // If it's a controller, we're running in servlet
boolean isServer = ste.getClassName().contains("MTGClone.controller"); boolean isServer = ste.getClassName().contains("MTGClone.controller");
if (isServer) { try {
System.out.println("Server detected!"); if(isServer) {
try {
Class.forName("com.mysql.jdbc.Driver"); Class.forName("com.mysql.jdbc.Driver");
FileInputStream input = new FileInputStream("database.properties"); FileInputStream input = new FileInputStream("database.properties");
Properties props = new Properties(); Properties props = new Properties();
props.load(input ); props.load(input );
c = DriverManager.getConnection(props.getProperty("DB_URL"),props.getProperty("DB_USERNAME"),props.getProperty("DB_PASSWORD")); c = DriverManager.getConnection(props.getProperty("DB_URL"),props.getProperty("DB_USERNAME"),props.getProperty("DB_PASSWORD"));
c.setAutoCommit(false); } else {
} catch (Exception e) {
System.err.println(e.getClass().getName() + ": " + e.getMessage());
return false;
}
return false;
} else {
try {
Class.forName("org.sqlite.JDBC"); Class.forName("org.sqlite.JDBC");
c = DriverManager.getConnection("jdbc:sqlite:cards.db"); c = DriverManager.getConnection("jdbc:sqlite:cards.db");
c.setAutoCommit(false);
} catch (Exception e) {
System.err.println(e.getClass().getName() + ": " + e.getMessage());
return false;
} }
c.setAutoCommit(false);
} catch (Exception e) {
System.err.println(e.getClass().getName() + ": " + e.getMessage());
return false;
} }
return true; return true;
} }