Adding rawExecSQL to SQLiteDatabase that will not throw exceptions on SELECT statements that don't return rows from the command (such as calling custom functions that are loaded from load_extension)

Author: developernotes

jni/net_sqlcipher_database_SQLiteDatabase.cpp

@@ -92,6 +92,17 @@ static void registerLoggingFunc(const char *path) {
     loggingFuncSet = true;
 }
 
+void native_rawExecSQL(JNIEnv* env, jobject object, jstring sql)
+{
+    sqlite3 * handle = (sqlite3 *)env->GetIntField(object, offset_db_handle);
+    char const * sqlCommand = env->GetStringUTFChars(sql, NULL);
+    int status = sqlite3_exec(handle, sqlCommand, NULL, NULL, NULL);
+    env->ReleaseStringUTFChars(sql, sqlCommand);
+    if(status != SQLITE_OK){
+        throw_sqlite3_exception(env, handle);      
+    }
+}
+
 /* public native void setICURoot(String path); */
 void setICURoot(JNIEnv* env, jobject object, jstring ICURoot)
 {
@@ -467,6 +478,7 @@ static JNINativeMethod sMethods[] =
     {"native_getDbLookaside", "()I", (void *)native_getDbLookaside},
     {"releaseMemory", "()I", (void *)native_releaseMemory},
     {"setICURoot", "(Ljava/lang/String;)V", (void *)setICURoot},
+    {"native_rawExecSQL", "(Ljava/lang/String;)V", (void *)native_rawExecSQL},
 };
 
 int register_android_database_SQLiteDatabase(JNIEnv *env)

src/net/sqlcipher/database/SQLiteDatabase.java

@@ -1805,6 +1805,32 @@ public void execSQL(String sql) throws SQLException {
         }
     }
 
+    public void rawExecSQL(String sql){
+        long timeStart = SystemClock.uptimeMillis();
+        lock();
+        if (!isOpen()) {
+            throw new IllegalStateException("database not open");
+        }
+        logTimeStat(mLastSqlStatement, timeStart, GET_LOCK_LOG_PREFIX);
+        try {
+            native_rawExecSQL(sql);
+        } catch (SQLiteDatabaseCorruptException e) {
+            onCorruption();
+            throw e;
+        } finally {
+            unlock();
+        }
+
+        // Log commit statements along with the most recently executed
+        // SQL statement for disambiguation.  Note that instance
+        // equality to COMMIT_SQL is safe here.
+        if (sql == COMMIT_SQL) {
+            logTimeStat(mLastSqlStatement, timeStart, COMMIT_SQL);
+        } else {
+            logTimeStat(sql, timeStart, null);
+        }
+    }
+    
     /**
      * Execute a single SQL statement that is not a query. For example, CREATE
      * TABLE, DELETE, INSERT, etc. Multiple statements separated by ;s are not
@@ -2355,4 +2381,6 @@ private static ArrayList<Pair<String, String>> getAttachedDbs(SQLiteDatabase dbO
      * @return int value of SQLITE_DBSTATUS_LOOKASIDE_USED
      */
     private native int native_getDbLookaside();
+
+    private native void native_rawExecSQL(String sql);
 }