Add handle to SQL for server or SQLite for client.
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@ -4,3 +4,4 @@ manifest.txt
|
|||||||
target/
|
target/
|
||||||
.DS_Store
|
.DS_Store
|
||||||
cards.db
|
cards.db
|
||||||
|
database.properties
|
||||||
|
|||||||
@ -1,5 +1,6 @@
|
|||||||
package MTGClone;
|
package MTGClone;
|
||||||
|
|
||||||
|
import java.io.FileInputStream;
|
||||||
import java.security.MessageDigest;
|
import java.security.MessageDigest;
|
||||||
import java.sql.*;
|
import java.sql.*;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
@ -8,6 +9,28 @@ public class SQLDriver {
|
|||||||
protected Connection c = null;
|
protected Connection c = null;
|
||||||
|
|
||||||
public boolean tryConnect() {
|
public boolean tryConnect() {
|
||||||
|
// Get the current stacktrace
|
||||||
|
StackTraceElement[] stacktrace = Thread.currentThread().getStackTrace();
|
||||||
|
// Get the caller of that called Deck, not SQLDriver
|
||||||
|
StackTraceElement ste = stacktrace[3];
|
||||||
|
// If it's a controller, we're running in servlet
|
||||||
|
boolean isServer = ste.getClassName().contains("MTGClone.controller");
|
||||||
|
if (isServer) {
|
||||||
|
System.out.println("Server detected!");
|
||||||
|
try {
|
||||||
|
Class.forName("com.mysql.jdbc.Driver");
|
||||||
|
FileInputStream input = new FileInputStream("database.properties");
|
||||||
|
Properties props = new Properties();
|
||||||
|
props.load(input );
|
||||||
|
c = DriverManager.getConnection(props.getProperty("DB_URL"),props.getProperty("DB_USERNAME"),props.getProperty("DB_PASSWORD"));
|
||||||
|
c.setAutoCommit(false);
|
||||||
|
} catch (Exception e) {
|
||||||
|
System.err.println(e.getClass().getName() + ": " + e.getMessage());
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
} else {
|
||||||
try {
|
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");
|
||||||
@ -16,6 +39,7 @@ public class SQLDriver {
|
|||||||
System.err.println(e.getClass().getName() + ": " + e.getMessage());
|
System.err.println(e.getClass().getName() + ": " + e.getMessage());
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -201,6 +225,7 @@ public class SQLDriver {
|
|||||||
+ " CREATURETYPE TEXT NOT NULL)";
|
+ " CREATURETYPE TEXT NOT NULL)";
|
||||||
stmt.executeUpdate(sql);
|
stmt.executeUpdate(sql);
|
||||||
stmt.close();
|
stmt.close();
|
||||||
|
c.commit();
|
||||||
c.close();
|
c.close();
|
||||||
if (!setupCards()) {
|
if (!setupCards()) {
|
||||||
System.exit(-1);
|
System.exit(-1);
|
||||||
|
|||||||
Reference in New Issue
Block a user