X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=util%2Forg%2Fcacert%2Fgigi%2Futil%2FDatabaseManager.java;h=891be0f44ebdb5382974b9c6bdae6b8433675611;hb=53a66914a544d38be7e626aec2e74542745d4fda;hp=34f80f9b85b8fb08ddc7753141af486112f718e3;hpb=7cf984749cf0027ccae90a53ebef07ab97ff164b;p=gigi.git

diff --git a/util/org/cacert/gigi/util/DatabaseManager.java b/util/org/cacert/gigi/util/DatabaseManager.java
index 34f80f9b..891be0f4 100644
--- a/util/org/cacert/gigi/util/DatabaseManager.java
+++ b/util/org/cacert/gigi/util/DatabaseManager.java
@@ -1,36 +1,56 @@
 package org.cacert.gigi.util;
 
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileReader;
 import java.io.IOException;
-import java.nio.file.Files;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.util.Properties;
+
+import org.cacert.gigi.database.DatabaseConnection;
+import org.cacert.gigi.database.SQLFileManager;
+import org.cacert.gigi.database.SQLFileManager.ImportType;
 
 public class DatabaseManager {
-	public static String readFile(File f) throws IOException {
-		return new String(Files.readAllBytes(f.toPath()));
-	}
-	public static void main(String[] args) throws SQLException,
-			ClassNotFoundException, IOException {
-		if (args.length < 4) {
-			System.err
-					.println("Usage: com.mysql.jdbc.Driver jdbc:mysql://localhost/cacert user password");
-			return;
-		}
-		Class.forName(args[0]);
-		Connection conn = DriverManager
-				.getConnection(args[1], args[2], args[3]);
-		Statement stmt = conn.createStatement();
-		String sql = readFile(new File("doc/tableStructure.sql"));
-		String[] stmts = sql.split(";");
-		for (String string : stmts) {
-			if (!string.trim().equals("")) {
-				stmt.addBatch(string);
-			}
-		}
-		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();
+            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, test ? ImportType.TEST : ImportType.PRODUCTION);
+    }
+
+    public static void run(String[] args, ImportType truncate) throws ClassNotFoundException, SQLException, IOException {
+        Class.forName(args[0]);
+        Connection conn = DriverManager.getConnection(args[1], args[2], args[3]);
+        conn.setAutoCommit(false);
+        Statement stmt = conn.createStatement();
+        SQLFileManager.addFile(stmt, DatabaseConnection.class.getResourceAsStream("tableStructure.sql"), truncate);
+        File localData = new File("doc/sampleData.sql");
+        if (localData.exists()) {
+            SQLFileManager.addFile(stmt, new FileInputStream(localData), ImportType.PRODUCTION);
+        }
+        stmt.executeBatch();
+        conn.commit();
+        stmt.close();
+    }
+
 }