Convert long to int where possible, fix retweetid

If there is no retweet, the retweetid must really be NULL, not 0. In
order to better match the database, convert some types to integers too.

1 files changed, 15 insertions, 6 deletions

diff --git a/src/database/NamedPreparedStatement.java b/src/database/NamedPreparedStatement.java
index c899376..ebb775b 100644
--- a/src/database/NamedPreparedStatement.java
+++ b/src/database/NamedPreparedStatement.java
@@ -4,6 +4,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Timestamp;
+import java.sql.Types;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
@@ -50,21 +51,29 @@ public class NamedPreparedStatement {
         return indices;
     }
 
-    public void setLong(String name, long l) throws SQLException {
+    public void setInt(String name, Integer i) throws SQLException {
         for (int paramIndex : getParamIndices(name)) {
-            stmt.setLong(paramIndex, l);
+            if (i == null) {
+                stmt.setNull(paramIndex, Types.INTEGER);
+            } else {
+                stmt.setInt(paramIndex, i);
+            }
         }
     }
 
-    public void setString(String name, String str) throws SQLException {
+    public void setLong(String name, Long l) throws SQLException {
         for (int paramIndex : getParamIndices(name)) {
-            stmt.setString(paramIndex, str);
+            if (l == null) {
+                stmt.setNull(paramIndex, Types.BIGINT);
+            } else {
+                stmt.setLong(paramIndex, l);
+            }
         }
     }
 
-    public void setString(String name, int i) throws SQLException {
+    public void setString(String name, String str) throws SQLException {
         for (int paramIndex : getParamIndices(name)) {
-            stmt.setInt(paramIndex, i);
+            stmt.setString(paramIndex, str);
         }
     }