Add support for rawQuery to binding parameters via an Object array.

Author: developernotes

src/net/sqlcipher/database/SQLiteDatabase.java

@@ -1785,6 +1785,53 @@ public Cursor rawQuery(String sql, String[] selectionArgs) {
         return rawQueryWithFactory(null, sql, selectionArgs, null);
     }
 
+
+      /**
+     * Runs the provided SQL and returns a {@link Cursor} over the result set.
+     *
+     * @param sql the SQL query. The SQL string must not be ; terminated
+     * @param args You may include ?s in where clause in the query,
+     *     which will be replaced by the values from args. The
+     *     values will be bound by their type.
+     *
+     * @return A {@link Cursor} object, which is positioned before the first entry. Note that
+     * {@link Cursor}s are not synchronized, see the documentation for more details.
+     *
+     * @throws SQLiteException if there is an issue executing the sql or the SQL string is invalid
+     * @throws IllegalStateException if the database is not open
+     */
+    public Cursor rawQuery(String sql, Object[] args) {
+        if (!isOpen()) {
+            throw new IllegalStateException("database not open");
+        }
+        long timeStart = 0;
+        if (Config.LOGV || mSlowQueryThreshold != -1) {
+            timeStart = System.currentTimeMillis();
+        }
+        SQLiteDirectCursorDriver driver = new SQLiteDirectCursorDriver(this, sql, null);
+        Cursor cursor = null;
+        try {
+            cursor = driver.query(mFactory, args);
+        } finally {
+            if (Config.LOGV || mSlowQueryThreshold != -1) {
+                // Force query execution
+                int count = -1;
+                if (cursor != null) {
+                    count = cursor.getCount();
+                }
+
+                long duration = System.currentTimeMillis() - timeStart;
+
+                if (Config.LOGV || duration >= mSlowQueryThreshold) {
+                    Log.v(TAG,
+                          "query (" + duration + " ms): " + driver.toString() +
+                          ", args are <redacted>, count is " + count);
+                }
+            }
+        }
+        return new CrossProcessCursorWrapper(cursor);
+    }
+
     /**
      * Runs the provided SQL and returns a cursor over the result set.
      *

src/net/sqlcipher/database/SQLiteDirectCursorDriver.java

@@ -37,6 +37,24 @@ public SQLiteDirectCursorDriver(SQLiteDatabase db, String sql, String editTable)
         mSql = sql;
     }
 
+    public Cursor query(CursorFactory factory, Object[] args) {
+        SQLiteQuery query = new SQLiteQuery(mDatabase, mSql, 0, args);
+        try {
+            query.bindArguments(args);
+            if (factory == null) {
+                mCursor = new SQLiteCursor(mDatabase, this, mEditTable, query);
+            } else {
+                mCursor = factory.newCursor(mDatabase, this, mEditTable, query);
+            }
+            mQuery = query;
+            query = null;
+            return mCursor;
+        } finally {
+            // Make sure this object is cleaned up if something happens
+            if (query != null) query.close();
+        }
+    }
+
     public Cursor query(CursorFactory factory, String[] selectionArgs) {
         // Compile the query
         SQLiteQuery query = new SQLiteQuery(mDatabase, mSql, 0, selectionArgs);

src/net/sqlcipher/database/SQLiteQuery.java

@@ -35,6 +35,7 @@ public class SQLiteQuery extends SQLiteProgram {
 
     /** Args to bind on requery */
     private String[] mBindArgs;
+    private Object[] mObjectBindArgs;
 
     private boolean mClosed = false;
 
@@ -52,6 +53,13 @@ public class SQLiteQuery extends SQLiteProgram {
         mBindArgs = bindArgs;
     }
 
+    SQLiteQuery(SQLiteDatabase db, String query, int offsetIndex, Object[] bindArgs) {
+        super(db, query);
+        mOffsetIndex = offsetIndex;
+        mObjectBindArgs = bindArgs;
+        mBindArgs = new String[mObjectBindArgs.length];
+    }
+
     /**
      * Reads rows into a buffer. This method acquires the database lock.
      *
@@ -142,8 +150,12 @@ public void close() {
         if (mBindArgs != null) {
             int len = mBindArgs.length;
             try {
-                for (int i = 0; i < len; i++) {
-                    super.bindString(i + 1, mBindArgs[i]);
+                if(mObjectBindArgs != null) {
+                    bindArguments(mObjectBindArgs);
+                } else {
+                    for (int i = 0; i < len; i++) {
+                        super.bindString(i + 1, mBindArgs[i]);
+                    }
                 }
             } catch (SQLiteMisuseException e) {
                 StringBuilder errMsg = new StringBuilder("mSql " + mSql);
@@ -183,6 +195,33 @@ public void bindString(int index, String value) {
         if (!mClosed) super.bindString(index, value);
     }
 
+    public void bindArguments(Object[] args){
+        if(args != null && args.length > 0){
+            for(int i = 0; i < args.length; i++){
+                Object value = args[i];
+                if(value == null){
+                    bindNull(i + 1);
+                } else if (value instanceof Double) {
+                    bindDouble(i + 1, (Double)value);
+                } else if (value instanceof Float) {
+                    float number = ((Number)value).floatValue();
+                    bindDouble(i + 1, new Double(number));
+                } else if (value instanceof Long) {
+                    bindLong(i + 1, (Long)value);
+                } else if(value instanceof Integer) {
+                    int number = ((Number) value).intValue();
+                    bindLong(i + 1, new Long(number));
+                } else if (value instanceof Boolean) {
+                    bindLong(i + 1, (Boolean)value ? 1 : 0);
+                } else if (value instanceof byte[]) {
+                    bindBlob(i + 1, (byte[])value);
+                } else {
+                    bindString(i + 1, value.toString());
+                }
+            }
+        }
+    }
+
     private final native int native_fill_window(CursorWindow window, 
             int startPos, int offsetParam, int maxRead, int lastPos);