X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=util%2Forg%2Fcacert%2Fgigi%2Futil%2FDatabaseManager.java;h=9fe3f5fb3ec774416152fe2a5433193b667350a6;hb=943d8e7ed0ea5a9d56e7e694a3cbd849c52bad16;hp=da0c054cce5343170bd8393969d2afae15aabdd0;hpb=086c38fbb11c5e3b23e609668e18f14b1aa6ccec;p=gigi.git

diff --git a/util/org/cacert/gigi/util/DatabaseManager.java b/util/org/cacert/gigi/util/DatabaseManager.java
index da0c054c..9fe3f5fb 100644
--- a/util/org/cacert/gigi/util/DatabaseManager.java
+++ b/util/org/cacert/gigi/util/DatabaseManager.java
@@ -1,48 +1,56 @@
 package org.cacert.gigi.util;
 
 import java.io.File;
+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;
 
 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;
-		}
-		run(args);
-	}
-	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();
-	}
-	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 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 == 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 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();
+    }
+
+    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);
+            }
+        }
+    }
 }