Implement prititive "show email certificates"

[gigi.git] / src / org / cacert / gigi / database / DatabaseConnection.java

diff --git a/src/org/cacert/gigi/database/DatabaseConnection.java b/src/org/cacert/gigi/database/DatabaseConnection.java
index 6d505d864cc65d01afffa3a8d5fe45f1fce40e95..c1eed41b5391d6ff18e75faf3fd5a916137aeb6b 100644 (file)
--- a/src/org/cacert/gigi/database/DatabaseConnection.java
+++ b/src/org/cacert/gigi/database/DatabaseConnection.java
@@ -5,6 +5,7 @@ import java.io.IOException;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
+import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.HashMap;
 import java.util.Properties;
@@ -27,7 +28,8 @@ public class DatabaseConnection {
                        e.printStackTrace();
                }
                try {
-                       c = DriverManager.getConnection(credentials.getProperty("url"),
+                       c = DriverManager.getConnection(credentials.getProperty("url")
+                                       + "?zeroDateTimeBehavior=convertToNull",
                                        credentials.getProperty("user"),
                                        credentials.getProperty("password"));
                } catch (SQLException e) {
@@ -43,6 +45,14 @@ public class DatabaseConnection {
                }
                return statement;
        }
+
+       public static int lastInsertId(PreparedStatement query) throws SQLException {
+               ResultSet rs = query.getGeneratedKeys();
+               rs.next();
+               int id = rs.getInt(1);
+               rs.close();
+               return id;
+       }
        static ThreadLocal<DatabaseConnection> instances = new ThreadLocal<DatabaseConnection>() {
                @Override
                protected DatabaseConnection initialValue() {