Use gigi.properties in DatabaseManager (if no cmdline args)

[gigi.git] / util / org / cacert / gigi / util / DatabaseManager.java

diff --git a/util/org/cacert/gigi/util/DatabaseManager.java b/util/org/cacert/gigi/util/DatabaseManager.java
index e43eeb36203ed71c550d4ce7ce08cdd24267a9a4..547922e6130cb78f02c2d8b7e1fad29e361791d1 100644 (file)
--- a/util/org/cacert/gigi/util/DatabaseManager.java
+++ b/util/org/cacert/gigi/util/DatabaseManager.java
@@ -1,12 +1,14 @@
 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 {
@@ -14,6 +16,13 @@ public class DatabaseManager {
        }
        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");
@@ -27,14 +36,22 @@ public class DatabaseManager {
                Connection conn = DriverManager
                                .getConnection(args[1], args[2], args[3]);
                Statement stmt = conn.createStatement();
-               String sql = readFile(new File("doc/tableStructure.sql"));
+               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);
                        }
                }
-               stmt.executeBatch();
-               stmt.close();
        }
 }