X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fdatabase%2FDatabaseConnection.java;h=661565d843a0a3f1b428a8f114d6c92cfc34129f;hp=6bed8bd979c2f62aec1b7922779bed3048716063;hb=a1a980dd0cc65f33a6189eb81a164fe79abb647c;hpb=0a814fdf958fab3f77d7d9d5333ad4307f7c9b8c

diff --git a/src/org/cacert/gigi/database/DatabaseConnection.java b/src/org/cacert/gigi/database/DatabaseConnection.java
index 6bed8bd9..661565d8 100644
--- a/src/org/cacert/gigi/database/DatabaseConnection.java
+++ b/src/org/cacert/gigi/database/DatabaseConnection.java
@@ -5,106 +5,116 @@ import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.util.HashMap;
 import java.util.Properties;
-import java.sql.Statement;
 
 public class DatabaseConnection {
-	public static final int CONNECTION_TIMEOUT = 24 * 60 * 60;
-	Connection c;
-	HashMap<String, PreparedStatement> statements = new HashMap<String, PreparedStatement>();
-	private static Properties credentials;
-	Statement adHoc;
-	public DatabaseConnection() {
-		try {
-			Class.forName(credentials.getProperty("sql.driver"));
-		} catch (ClassNotFoundException e) {
-			e.printStackTrace();
-		}
-		tryConnect();
-
-	}
-	private void tryConnect() {
-		try {
-			c = DriverManager.getConnection(credentials.getProperty("sql.url")
-					+ "?zeroDateTimeBehavior=convertToNull",
-					credentials.getProperty("sql.user"),
-					credentials.getProperty("sql.password"));
-			PreparedStatement ps = c
-					.prepareStatement("SET SESSION wait_timeout=?;");
-			ps.setInt(1, CONNECTION_TIMEOUT);
-			ps.execute();
-			ps.close();
-			adHoc = c.createStatement();
-		} catch (SQLException e) {
-			e.printStackTrace();
-		}
-	}
-	public PreparedStatement prepare(String query) throws SQLException {
-		ensureOpen();
-		PreparedStatement statement = statements.get(query);
-		if (statement == null) {
-			statement = c.prepareStatement(query,
-					Statement.RETURN_GENERATED_KEYS);
-			statements.put(query, statement);
-		}
-		return statement;
-	}
-	long lastAction = System.currentTimeMillis();
-	private void ensureOpen() {
-		if (System.currentTimeMillis() - lastAction > CONNECTION_TIMEOUT * 1000L) {
-			try {
-				ResultSet rs = adHoc.executeQuery("SELECT 1");
-				rs.close();
-				lastAction = System.currentTimeMillis();
-				return;
-			} catch (SQLException e) {
-			}
-			statements.clear();
-			tryConnect();
-		}
-		lastAction = System.currentTimeMillis();
-	}
-	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() {
-			return new DatabaseConnection();
-		}
-	};
-	public static DatabaseConnection getInstance() {
-		return instances.get();
-	}
-	public static boolean isInited() {
-		return credentials != null;
-	}
-	public static void init(Properties conf) {
-		if (credentials != null) {
-			throw new Error("Re-initiaizing is forbidden.");
-		}
-		credentials = conf;
-	}
-	public void beginTransaction() throws SQLException {
-		c.setAutoCommit(false);
-	}
-	public void commitTransaction() throws SQLException {
-		c.commit();
-		c.setAutoCommit(true);
-	}
-	public void quitTransaction() {
-		try {
-			if (!c.getAutoCommit()) {
-				c.rollback();
-				c.setAutoCommit(true);
-			}
-		} catch (SQLException e) {
-			e.printStackTrace();
-		}
-	}
+
+    public static final int CONNECTION_TIMEOUT = 24 * 60 * 60;
+
+    private Connection c;
+
+    private HashMap<String, GigiPreparedStatement> statements = new HashMap<String, GigiPreparedStatement>();
+
+    private static Properties credentials;
+
+    private Statement adHoc;
+
+    public DatabaseConnection() {
+        try {
+            Class.forName(credentials.getProperty("sql.driver"));
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+        tryConnect();
+
+    }
+
+    private void tryConnect() {
+        try {
+            c = DriverManager.getConnection(credentials.getProperty("sql.url") + "?zeroDateTimeBehavior=convertToNull", credentials.getProperty("sql.user"), credentials.getProperty("sql.password"));
+            PreparedStatement ps = c.prepareStatement("SET SESSION wait_timeout=?, time_zone='+0:00';");
+            ps.setInt(1, CONNECTION_TIMEOUT);
+            ps.execute();
+            ps.close();
+            adHoc = c.createStatement();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public GigiPreparedStatement prepare(String query) {
+        ensureOpen();
+        GigiPreparedStatement statement = statements.get(query);
+        if (statement == null) {
+            try {
+                statement = new GigiPreparedStatement(c.prepareStatement(query, Statement.RETURN_GENERATED_KEYS));
+            } catch (SQLException e) {
+                throw new Error(e);
+            }
+            statements.put(query, statement);
+        }
+        return statement;
+    }
+
+    private long lastAction = System.currentTimeMillis();
+
+    private void ensureOpen() {
+        if (System.currentTimeMillis() - lastAction > CONNECTION_TIMEOUT * 1000L) {
+            try {
+                ResultSet rs = adHoc.executeQuery("SELECT 1");
+                rs.close();
+                lastAction = System.currentTimeMillis();
+                return;
+            } catch (SQLException e) {
+            }
+            statements.clear();
+            tryConnect();
+        }
+        lastAction = System.currentTimeMillis();
+    }
+
+    private static ThreadLocal<DatabaseConnection> instances = new ThreadLocal<DatabaseConnection>() {
+
+        @Override
+        protected DatabaseConnection initialValue() {
+            return new DatabaseConnection();
+        }
+    };
+
+    public static DatabaseConnection getInstance() {
+        return instances.get();
+    }
+
+    public static boolean isInited() {
+        return credentials != null;
+    }
+
+    public static void init(Properties conf) {
+        if (credentials != null) {
+            throw new Error("Re-initiaizing is forbidden.");
+        }
+        credentials = conf;
+    }
+
+    public void beginTransaction() throws SQLException {
+        c.setAutoCommit(false);
+    }
+
+    public void commitTransaction() throws SQLException {
+        c.commit();
+        c.setAutoCommit(true);
+    }
+
+    public void quitTransaction() {
+        try {
+            if ( !c.getAutoCommit()) {
+                c.rollback();
+                c.setAutoCommit(true);
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
 }