From 086c38fbb11c5e3b23e609668e18f14b1aa6ccec Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Sat, 28 Jun 2014 03:16:11 +0200 Subject: [PATCH] Database Manager: add optional "user data" sqlscript on creation. --- doc/.gitignore | 1 + util/org/cacert/gigi/util/DatabaseManager.java | 14 +++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 doc/.gitignore diff --git a/doc/.gitignore b/doc/.gitignore new file mode 100644 index 00000000..4696a083 --- /dev/null +++ b/doc/.gitignore @@ -0,0 +1 @@ +sampleData.sql diff --git a/util/org/cacert/gigi/util/DatabaseManager.java b/util/org/cacert/gigi/util/DatabaseManager.java index e43eeb36..da0c054c 100644 --- a/util/org/cacert/gigi/util/DatabaseManager.java +++ b/util/org/cacert/gigi/util/DatabaseManager.java @@ -27,14 +27,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(); } } -- 2.39.2