X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=util%2Forg%2Fcacert%2Fgigi%2Futil%2FDatabaseManager.java;h=20df139ac9f8b6f13aa9fc528dd2371d6ab0d177;hp=471083953b8d2b2f1362f8d440eca5016c7789de;hb=68e22b81ae47cbc607d92cef050a1ce91017b805;hpb=2824d1c165c501e2f3a8809044788b33b81f478a

diff --git a/util/org/cacert/gigi/util/DatabaseManager.java b/util/org/cacert/gigi/util/DatabaseManager.java
index 47108395..20df139a 100644
--- a/util/org/cacert/gigi/util/DatabaseManager.java
+++ b/util/org/cacert/gigi/util/DatabaseManager.java
@@ -1,54 +1,73 @@
 package org.cacert.gigi.util;
 
 import java.io.File;
-import java.io.FileReader;
+import java.io.FileInputStream;
 import java.io.IOException;
-import java.nio.file.Files;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Properties;
 
-public class DatabaseManager {
-	public static String readFile(File f) throws IOException {
-		return new String(Files.readAllBytes(f.toPath()));
-	}
+import org.cacert.gigi.database.DatabaseConnection;
+import org.cacert.gigi.database.SQLFileManager;
+import org.cacert.gigi.database.SQLFileManager.ImportType;
 
-	public static void main(String[] args) throws SQLException, ClassNotFoundException, IOException {
-		if (args.length == 0) {
-			Properties p = new Properties();
-			p.load(new FileReader("config/gigi.properties"));
-			args = new String[] { p.getProperty("sql.driver"), p.getProperty("sql.url"), p.getProperty("sql.user"),
-					p.getProperty("sql.password") };
-		}
-		if (args.length < 4) {
-			System.err.println("Usage: com.mysql.jdbc.Driver jdbc:mysql://localhost/cacert user password");
-			return;
-		}
-		run(args);
-	}
+public class DatabaseManager {
 
-	public static void run(String[] args) throws ClassNotFoundException, SQLException, IOException {
-		Class.forName(args[0]);
-		Connection conn = DriverManager.getConnection(args[1], args[2], args[3]);
-		Statement stmt = conn.createStatement();
-		addFile(stmt, new File("doc/tableStructure.sql"));
-		File localData = new File("doc/sampleData.sql");
-		if (localData.exists()) {
-			addFile(stmt, localData);
-		}
-		stmt.executeBatch();
-		stmt.close();
-	}
+    public static void main(String[] args) throws SQLException, ClassNotFoundException, IOException {
+        boolean test = false;
+        if (args.length >= 1 && args[0].equals("--test")) {
+            test = true;
+            String[] ne = new String[args.length - 1];
+            System.arraycopy(args, 1, ne, 0, ne.length);
+            args = ne;
+        }
+        if (args.length == 0) {
+            Properties p = new Properties();
+            try (Reader reader = new InputStreamReader(new FileInputStream("config/gigi.properties"), "UTF-8")) {
+                p.load(reader);
+            }
+            args = new String[] {
+                    p.getProperty("sql.driver"), p.getProperty("sql.url"), p.getProperty("sql.user"), p.getProperty("sql.password")
+            };
+        }
+        if (args.length < 4) {
+            System.err.println("Usage: com.mysql.jdbc.Driver jdbc:mysql://localhost/cacert user password");
+            return;
+        }
+        run(args, test ? ImportType.TEST : ImportType.PRODUCTION);
+    }
 
-	private static void addFile(Statement stmt, File f) throws IOException, SQLException {
-		String sql = readFile(f);
-		String[] stmts = sql.split(";");
-		for (String string : stmts) {
-			if (!string.trim().equals("")) {
-				stmt.addBatch(string);
-			}
-		}
-	}
+    public static void run(String[] args, ImportType truncate) throws ClassNotFoundException, SQLException, IOException {
+        Class.forName(args[0]);
+        final Connection conn = DriverManager.getConnection(args[1], args[2], args[3]);
+        try {
+            conn.setAutoCommit(false);
+            Statement stmt = conn.createStatement();
+            try {
+                try (InputStream structure = DatabaseConnection.class.getResourceAsStream("tableStructure.sql")) {
+                    SQLFileManager.addFile(stmt, structure, truncate);
+                }
+                File localData = new File("doc/sampleData.sql");
+                if (localData.exists()) {
+                    try (FileInputStream f = new FileInputStream(localData)) {
+                        SQLFileManager.addFile(stmt, f, ImportType.PRODUCTION);
+                    }
+                }
+                stmt.executeBatch();
+                conn.commit();
+            } finally {
+                stmt.close();
+            }
+        } catch (SQLException e) {
+            e.getNextException().printStackTrace();
+            throw e;
+        } finally {
+            conn.close();
+        }
+    }
 }