@@ -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 ->
 
@@ -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
 
@@ -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