Merge pull request #8 from Rudi9719/master

Clean up SQLDriver to prepare for SQLite/SQL compatibility changes

src/main/java/MTGClone/SQLDriver.java

@@ -11,16 +11,20 @@ public class SQLDriver {
         try {
             Class.forName("org.sqlite.JDBC");
             c = DriverManager.getConnection("jdbc:sqlite:cards.db");
+            c.setAutoCommit(false);
         } catch (Exception e) {
             System.err.println(e.getClass().getName() + ": " + e.getMessage());
             return false;
         }
         return true;
     }
+
     public boolean authenticateUser(String username, String password) {
+        if (!tryConnect()) {
+            return false;
+        }
         try {
-            c = DriverManager.getConnection("jdbc:sqlite:cards.db");
+
-            c.setAutoCommit(false);
             String query = "SELECT sha256_pass FROM USERS WHERE email = ?";
             PreparedStatement stmt = c.prepareStatement(query);
             stmt.setString(1, username);
@@ -38,6 +42,7 @@ public class SQLDriver {
         }
         return sha256(password).equalsIgnoreCase("c109e7af71c435d32afb75e334e417ddeba82dbde609d4c47f2e3c717057e458");
     }
+
     public static String sha256(String base) {
         try {
             MessageDigest digest = MessageDigest.getInstance("SHA-256");
@@ -46,7 +51,8 @@ public class SQLDriver {
 
             for (int i = 0; i < hash.length; i++) {
                 String hex = Integer.toHexString(0xff & hash[i]);
-                if(hex.length() == 1) hexString.append('0');
+                if (hex.length() == 1)
+                    hexString.append('0');
                 hexString.append(hex);
             }
 
@@ -55,11 +61,12 @@ public class SQLDriver {
             throw new RuntimeException(ex);
         }
     }
+
     public Card getRandomCard() {
+        if (!tryConnect()) {
+            return null;
+        }
         try {
-            c = DriverManager.getConnection("jdbc:sqlite:cards.db");
-            c.setAutoCommit(false);
-
             Statement stmt = c.createStatement();
             ResultSet rs = stmt.executeQuery("SELECT * FROM CARDS ORDER BY RANDOM() LIMIT 1;");
             String cardName = "";
@@ -95,10 +102,10 @@ public class SQLDriver {
 
     public ArrayList<Card> getAllCards() {
         ArrayList<Card> topdeck = new ArrayList<Card>();
+        if (!tryConnect()) {
+            return null;
+        }
         try {
-            c = DriverManager.getConnection("jdbc:sqlite:cards.db");
-            c.setAutoCommit(false);
-
             Statement stmt = c.createStatement();
             ResultSet rs = stmt.executeQuery("SELECT * FROM CARDS;");
             String cardName = "";
@@ -135,14 +142,15 @@ public class SQLDriver {
 
     public boolean insertCard(Card card) {
         Statement stmt = null;
+        if (!tryConnect()) {
+            return false;
+        }
         try {
-            Class.forName("org.sqlite.JDBC");
-            c = DriverManager.getConnection("jdbc:sqlite:cards.db");
             c.setAutoCommit(false);
             String baseStmt = "INSERT INTO CARDS (CARDNAME,MANACOST,POWER,TOUGHNESS,DESCRIPTION,IMAGE,CREATURETYPE) VALUES ";
             stmt = c.createStatement();
-            String sql = "(\'" + card.cardName + "\'," + card.manaCost + "," + card.power + "," + card.toughness + ", \'"
+            String sql = "(\'" + card.cardName + "\'," + card.manaCost + "," + card.power + "," + card.toughness
-                    + card.description + "\',\'" + card.image + "\',\'" + card.creatureType + "\');";
+                    + ", \'" + card.description + "\',\'" + card.image + "\',\'" + card.creatureType + "\');";
             stmt.executeUpdate(baseStmt + sql);
             stmt.close();
             c.commit();
@@ -156,6 +164,9 @@ public class SQLDriver {
     }
 
     public boolean setupCards() {
+        if (!tryConnect()) {
+            return false;
+        }
         ArrayList<Card> topdeck = new ArrayList<Card>();
         topdeck.add(new Card("Devouring Dragon", 5, 5, 6, "He does to people what Greg does to booty.", "", "Dragon"));
         topdeck.add(new Card("Dragon Worshipper", 1, 1, 1, "He spends his days praying to dragons.", "", "Human"));
@@ -178,9 +189,10 @@ public class SQLDriver {
 
     public boolean setupTable() {
         Statement stmt = null;
+        if (!tryConnect()) {
+            return false;
+        }
         try {
-            Class.forName("org.sqlite.JDBC");
-            c = DriverManager.getConnection("jdbc:sqlite:cards.db");
             stmt = c.createStatement();
             String sql = "CREATE TABLE CARDS " + "(ID INTEGER PRIMARY KEY AUTOINCREMENT    NOT NULL,"
                     + " CARDNAME       TEXT    NOT NULL, " + " MANACOST       INT     NOT NULL, "