Skip to content

Commit bef1fa2

Browse files
committed
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.
1 parent bc71616 commit bef1fa2

2 files changed

Lines changed: 26 additions & 0 deletions

File tree

‎sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher/driver/SQLCipherConnectionTests.kt‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
package net.zetetic.database.sqlcipher.driver
22

33
import android.content.Context
4+
import androidx.sqlite.SQLITE_DATA_BLOB
5+
import androidx.sqlite.SQLITE_DATA_FLOAT
6+
import androidx.sqlite.SQLITE_DATA_INTEGER
7+
import androidx.sqlite.SQLITE_DATA_NULL
8+
import androidx.sqlite.SQLITE_DATA_TEXT
49
import androidx.sqlite.SQLiteConnection
510
import androidx.sqlite.execSQL
611
import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -156,6 +161,18 @@ class SQLCipherConnectionTests {
156161
}
157162
}
158163

164+
@Test
165+
fun shouldReportColumnTypesUsingSqliteDataConstants() {
166+
connection.prepare("SELECT NULL, 1, 1.5, 'text', x'00'").use { statement ->
167+
assertTrue(statement.step())
168+
assertEquals(SQLITE_DATA_NULL, statement.getColumnType(0))
169+
assertEquals(SQLITE_DATA_INTEGER, statement.getColumnType(1))
170+
assertEquals(SQLITE_DATA_FLOAT, statement.getColumnType(2))
171+
assertEquals(SQLITE_DATA_TEXT, statement.getColumnType(3))
172+
assertEquals(SQLITE_DATA_BLOB, statement.getColumnType(4))
173+
}
174+
}
175+
159176
@Test
160177
fun shouldRoundTripDataThroughStandardStatement() {
161178
connection.prepare("INSERT INTO t (id, v) VALUES (?, ?)").use { statement ->

‎sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher/driver/SupportAPIRoomTest.kt‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,15 @@ class SupportAPIRoomTest {
176176
assertThat(db.getSupportWrapper().isWriteAheadLoggingEnabled, `is`(true))
177177
}
178178

179+
@Test
180+
fun shouldReadNullColumnThroughSupportWrapperCursor() {
181+
db.getSupportWrapper().query("SELECT NULL AS empty_value, 'x' AS present_value").use { cursor ->
182+
assertThat(cursor.moveToFirst(), `is`(true))
183+
assertThat(cursor.isNull(0), `is`(true))
184+
assertThat(cursor.getString(1), `is`("x"))
185+
}
186+
}
187+
179188
@Database(entities = [User::class], version = 1, exportSchema = false)
180189
abstract class AppDatabase : RoomDatabase() {
181190
abstract fun userDao(): UserDao

0 commit comments

Comments
 (0)