Remove sparse index checks (#476)

* Remove sparse index checks

* update tests to account for null param

Author: benasher44

src/main/java/org/sqlite/core/CorePreparedStatement.java

@@ -23,15 +23,13 @@
 
 import java.sql.Date;
 import java.sql.SQLException;
-import java.util.BitSet;
 import java.util.Calendar;
 
 public abstract class CorePreparedStatement extends JDBC4Statement
 {
     protected int columnCount;
     protected int paramCount;
     protected int batchQueryCount;
-    protected BitSet paramValid;
 
     /**
      * Constructs a prepared statement on a provided connection.
@@ -48,7 +46,6 @@ protected CorePreparedStatement(SQLiteConnection conn, String sql) throws SQLExc
         rs.colsMeta = db.column_names(pointer);
         columnCount = db.column_count(pointer);
         paramCount = db.bind_parameter_count(pointer);
-        paramValid = new BitSet(paramCount);
         batchQueryCount = 0;
         batch = null;
         batchPos = 0;
@@ -62,15 +59,6 @@ protected void finalize() throws SQLException {
         close();
     }
 
-    /**
-     * Checks if values are bound to statement parameters.
-     * @throws SQLException
-     */
-    protected void checkParameters() throws SQLException {
-        if (paramValid.cardinality() != paramCount)
-            throw new SQLException("Values not bound to statement");
-    }
-
     /**
      * @see org.sqlite.jdbc3.JDBC3Statement#executeBatch()
      */
@@ -80,8 +68,6 @@ public int[] executeBatch() throws SQLException {
             return new int[] {};
         }
 
-        checkParameters();
-
         try {
             return conn.getDatabase().executeBatch(pointer, batchQueryCount, batch, conn.getAutoCommit());
         }
@@ -96,7 +82,6 @@ public int[] executeBatch() throws SQLException {
     @Override
     public void clearBatch() throws SQLException {
         super.clearBatch();
-        paramValid.clear();
         batchQueryCount = 0;
     }
 
@@ -125,10 +110,8 @@ protected void batch(int pos, Object value) throws SQLException {
         checkOpen();
         if (batch == null) {
             batch = new Object[paramCount];
-            paramValid.clear();
         }
         batch[batchPos + pos - 1] = value;
-        paramValid.set(pos - 1);
     }
 
 

src/main/java/org/sqlite/jdbc3/JDBC3PreparedStatement.java

@@ -36,7 +36,6 @@ protected JDBC3PreparedStatement(SQLiteConnection conn, String sql) throws SQLEx
     public void clearParameters() throws SQLException {
         checkOpen();
         conn.getDatabase().clear_bindings(pointer);
-        paramValid.clear();
         if (batch != null)
             for (int i = batchPos; i < batchPos + paramCount; i++)
                 batch[i] = null;
@@ -49,7 +48,6 @@ public boolean execute() throws SQLException {
         checkOpen();
         rs.close();
         conn.getDatabase().reset(pointer);
-        checkParameters();
 
         boolean success = false;
         try {
@@ -73,7 +71,6 @@ public ResultSet executeQuery() throws SQLException {
 
         rs.close();
         conn.getDatabase().reset(pointer);
-        checkParameters();
 
         boolean success = false;
         try {
@@ -97,7 +94,6 @@ public int executeUpdate() throws SQLException {
 
         rs.close();
         conn.getDatabase().reset(pointer);
-        checkParameters();
 
         return conn.getDatabase().executeUpdate(this, batch);
     }
@@ -107,12 +103,10 @@ public int executeUpdate() throws SQLException {
      */
     public void addBatch() throws SQLException {
         checkOpen();
-        checkParameters();
         batchPos += paramCount;
         batchQueryCount++;
         if (batch == null) {
             batch = new Object[paramCount];
-            paramValid.clear();
         }
         if (batchPos + paramCount > batch.length) {
             Object[] nb = new Object[batch.length * 2];

src/test/java/org/sqlite/PrepStmtTest.java

@@ -578,6 +578,7 @@ public void reusingSetValues() throws SQLException {
     public void clearParameters() throws SQLException {
         stat.executeUpdate("create table tbl (colid integer primary key AUTOINCREMENT, col varchar)");
         stat.executeUpdate("insert into tbl(col) values (\"foo\")");
+        stat.executeUpdate("insert into tbl(col) values (?)");
 
         PreparedStatement prep = conn.prepareStatement("select colid from tbl where col = ?");
 
@@ -591,36 +592,26 @@ public void clearParameters() throws SQLException {
 
         rs.close();
 
-        try {
-            prep.execute();
-            fail("Returned result when values not bound to prepared statement");
-        } catch (Exception e) {
-            assertEquals("Values not bound to statement", e.getMessage());
-        }
+        // should not throw
+        prep.execute();
 
-        try {
-            rs = prep.executeQuery();
-            fail("Returned result when values not bound to prepared statement");
-        } catch (Exception e) {
-            assertEquals("Values not bound to statement", e.getMessage());
-        }
+        // should not throw
+        PreparedStatement nullPrep = conn.prepareStatement("select colid from tbl where col is null");
+        rs = nullPrep.executeQuery();
+        rs.next();
 
-        prep.close();
+        // gets the row with the NULL column
+        assertEquals(2, rs.getInt(1));
 
-        try {
-            prep = conn.prepareStatement("insert into tbl(col) values (?)");
-            prep.clearParameters();
-            prep.executeUpdate();
-            fail("Returned result when values not bound to prepared statement");
-        } catch (Exception e) {
-            assertEquals("Values not bound to statement", e.getMessage());
-        }
+        rs.close();
+        nullPrep.close();
     }
 
-    @Test(expected = SQLException.class)
-    public void preparedStatementShouldThrowIfNotAllParamsSet() throws SQLException {
+    public void preparedStatementShouldNotThrowIfNotAllParamsSet() throws SQLException {
         PreparedStatement prep = conn.prepareStatement("select ? as col1, ? as col2, ? as col3;");
         ResultSetMetaData meta = prep.getMetaData();
+
+        // leaves 0 and 1 unbound
         assertEquals(meta.getColumnCount(), 3);
 
         // we only set one 1 param of the expected 3 params
@@ -629,15 +620,13 @@ public void preparedStatementShouldThrowIfNotAllParamsSet() throws SQLException
         prep.close();
     }
 
-    @Test(expected = SQLException.class)
-    public void preparedStatementShouldThrowIfNotAllParamsSetBatch() throws SQLException {
+    public void preparedStatementShouldNotThrowIfNotAllParamsSetBatch() throws SQLException {
         stat.executeUpdate("create table test (c1, c2);");
         PreparedStatement prep = conn.prepareStatement("insert into test values (?,?);");
+
+        // leaves param 0 unbound
         prep.setInt(1, 1);
 
-        // addBatch should throw since we added a command with invalid params set
-        // which becomes immutable once added to the batch so it makes sense to verify
-        // at the point when you add a command instead of delaying till batch execution
         prep.addBatch();
     }