From bef1fa2f03534595b67fa6a3735ef7c3532cdc5e Mon Sep 17 00:00:00 2001 From: Zoey Jones Date: Thu, 24 Sep 2026 15:28:13 -0700 Subject: [PATCH 1/2] Add tests: SQLCipherStatement.getColumnType must report SQLITE_DATA_* values SQLCipherStatement implements androidx.sqlite.SQLiteStatement, whose getColumnType contract is androidx.sqlite's SQLITE_DATA_* constants. A NULL column is currently reported as Cursor.FIELD_TYPE_NULL (0) rather than SQLITE_DATA_NULL (5), so room3-sqlite-wrapper's toCursor() throws IllegalStateException: Unknown column type: 0 on any NULL value. --- .../driver/SQLCipherConnectionTests.kt | 17 +++++++++++++++++ .../sqlcipher/driver/SupportAPIRoomTest.kt | 9 +++++++++ 2 files changed, 26 insertions(+) diff --git a/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher/driver/SQLCipherConnectionTests.kt b/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher/driver/SQLCipherConnectionTests.kt index 5eee460..f4a7cbf 100644 --- a/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher/driver/SQLCipherConnectionTests.kt +++ b/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher/driver/SQLCipherConnectionTests.kt @@ -1,6 +1,11 @@ package net.zetetic.database.sqlcipher.driver import android.content.Context +import androidx.sqlite.SQLITE_DATA_BLOB +import androidx.sqlite.SQLITE_DATA_FLOAT +import androidx.sqlite.SQLITE_DATA_INTEGER +import androidx.sqlite.SQLITE_DATA_NULL +import androidx.sqlite.SQLITE_DATA_TEXT import androidx.sqlite.SQLiteConnection import androidx.sqlite.execSQL import androidx.test.ext.junit.runners.AndroidJUnit4 @@ -156,6 +161,18 @@ class SQLCipherConnectionTests { } } + @Test + fun shouldReportColumnTypesUsingSqliteDataConstants() { + connection.prepare("SELECT NULL, 1, 1.5, 'text', x'00'").use { statement -> + assertTrue(statement.step()) + assertEquals(SQLITE_DATA_NULL, statement.getColumnType(0)) + assertEquals(SQLITE_DATA_INTEGER, statement.getColumnType(1)) + assertEquals(SQLITE_DATA_FLOAT, statement.getColumnType(2)) + assertEquals(SQLITE_DATA_TEXT, statement.getColumnType(3)) + assertEquals(SQLITE_DATA_BLOB, statement.getColumnType(4)) + } + } + @Test fun shouldRoundTripDataThroughStandardStatement() { connection.prepare("INSERT INTO t (id, v) VALUES (?, ?)").use { statement -> diff --git a/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher/driver/SupportAPIRoomTest.kt b/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher/driver/SupportAPIRoomTest.kt index 8d8730f..694dc8d 100644 --- a/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher/driver/SupportAPIRoomTest.kt +++ b/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher/driver/SupportAPIRoomTest.kt @@ -176,6 +176,15 @@ class SupportAPIRoomTest { assertThat(db.getSupportWrapper().isWriteAheadLoggingEnabled, `is`(true)) } + @Test + fun shouldReadNullColumnThroughSupportWrapperCursor() { + db.getSupportWrapper().query("SELECT NULL AS empty_value, 'x' AS present_value").use { cursor -> + assertThat(cursor.moveToFirst(), `is`(true)) + assertThat(cursor.isNull(0), `is`(true)) + assertThat(cursor.getString(1), `is`("x")) + } + } + @Database(entities = [User::class], version = 1, exportSchema = false) abstract class AppDatabase : RoomDatabase() { abstract fun userDao(): UserDao From 35bc3b047b380ab5f3600804627921976ecd1244 Mon Sep 17 00:00:00 2001 From: Zoey Jones Date: Thu, 24 Sep 2026 15:29:15 -0700 Subject: [PATCH 2/2] Map Cursor field types to SQLITE_DATA_* in SQLCipherStatement.getColumnType getColumnType returned Cursor.getType() unchanged. Cursor.FIELD_TYPE_NULL is 0 while androidx.sqlite's SQLITE_DATA_NULL is 5, so every NULL column violated the SQLiteStatement contract. Each Cursor field type is now mapped explicitly, and an unknown value throws instead of passing through. --- .../sqlcipher/driver/SQLCipherStatement.java | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/sqlcipher/src/main/java/net/zetetic/database/sqlcipher/driver/SQLCipherStatement.java b/sqlcipher/src/main/java/net/zetetic/database/sqlcipher/driver/SQLCipherStatement.java index 2ad3806..071cb65 100644 --- a/sqlcipher/src/main/java/net/zetetic/database/sqlcipher/driver/SQLCipherStatement.java +++ b/sqlcipher/src/main/java/net/zetetic/database/sqlcipher/driver/SQLCipherStatement.java @@ -3,6 +3,7 @@ import android.database.Cursor; import androidx.annotation.NonNull; +import androidx.sqlite.SQLite; import androidx.sqlite.SQLiteStatement; import android.database.SQLException; @@ -115,7 +116,24 @@ public String getColumnName( @Override public int getColumnType( int index) { - return requireCursor().getType(index); + return toSqliteDataType(requireCursor().getType(index)); + } + + private static int toSqliteDataType(int cursorFieldType) { + switch (cursorFieldType) { + case Cursor.FIELD_TYPE_NULL: + return SQLite.SQLITE_DATA_NULL; + case Cursor.FIELD_TYPE_INTEGER: + return SQLite.SQLITE_DATA_INTEGER; + case Cursor.FIELD_TYPE_FLOAT: + return SQLite.SQLITE_DATA_FLOAT; + case Cursor.FIELD_TYPE_STRING: + return SQLite.SQLITE_DATA_TEXT; + case Cursor.FIELD_TYPE_BLOB: + return SQLite.SQLITE_DATA_BLOB; + default: + throw new SQLException("unknown cursor field type " + cursorFieldType); + } } @Override