fix: show import problems in databaseManager more detailed

[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 da0c054cce5343170bd8393969d2afae15aabdd0..20df139ac9f8b6f13aa9fc528dd2371d6ab0d177 100644 (file)
--- a/util/org/cacert/gigi/util/DatabaseManager.java
+++ b/util/org/cacert/gigi/util/DatabaseManager.java
@@ -1,48 +1,73 @@
 package org.cacert.gigi.util;
 
 import java.io.File;
+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;
+
+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;
-               }
-               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 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);
+    }
+
+    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();
+        }
+    }
 }