fix: SQL change database call pattern

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

diff --git a/src/org/cacert/gigi/database/GigiPreparedStatement.java b/src/org/cacert/gigi/database/GigiPreparedStatement.java
index 6d967648e9695a0c0e8781c95888b571904a4bed..411b1fd5fb840056fa5000acc58d1d8be7a164aa 100644 (file)
--- a/src/org/cacert/gigi/database/GigiPreparedStatement.java
+++ b/src/org/cacert/gigi/database/GigiPreparedStatement.java
@@ -6,17 +6,35 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Timestamp;
 
-public class GigiPreparedStatement {
+public class GigiPreparedStatement implements AutoCloseable {
 
     private PreparedStatement target;
 
-    public GigiPreparedStatement(PreparedStatement preparedStatement) {
+    private GigiResultSet rs;
+
+    protected GigiPreparedStatement(PreparedStatement preparedStatement) {
         target = preparedStatement;
     }
 
+    public GigiPreparedStatement(String stmt) {
+        this(stmt, false);
+    }
+
+    public GigiPreparedStatement(String stmt, boolean scroll) {
+        try {
+            if (scroll) {
+                target = DatabaseConnection.getInstance().prepareInternalScrollable(stmt);
+            } else {
+                target = DatabaseConnection.getInstance().prepareInternal(stmt);
+            }
+        } catch (SQLException e) {
+            throw new Error(e);
+        }
+    }
+
     public GigiResultSet executeQuery() {
         try {
-            return new GigiResultSet(target.executeQuery());
+            return rs = new GigiResultSet(target.executeQuery());
         } catch (SQLException e) {
             handleSQL(e);
             throw new Error(e);
@@ -107,4 +125,16 @@ public class GigiPreparedStatement {
 
     }
 
+    @Override
+    public void close() {
+        GigiResultSet r = rs;
+        if (r != null) {
+            r.close();
+        }
+        PreparedStatement tg = target;
+        target = null;
+        DatabaseConnection.getInstance().returnStatement(tg);
+
+    }
+
 }