@@ -1,16 +1,23 @@
 package net.zetetic.database.sqlcipher.driver
 
 import android.content.Context
+import android.database.Cursor
+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
 import androidx.test.platform.app.InstrumentationRegistry
-import kotlinx.coroutines.test.runTest
 import net.zetetic.database.sqlcipher.SQLiteDatabase
 import org.junit.After
 import org.junit.Assert.assertArrayEquals
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertNull
 import org.junit.Assert.assertThrows
 import org.junit.Assert.assertTrue
 import org.junit.Before
@@ -156,6 +163,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 ->
@@ -233,6 +252,32 @@ class SQLCipherConnectionTests {
         }
     }
 
+    @Test
+    fun shouldCloseCursorWhenStatementClosedAfterStep() {
+        database.execSQL(
+            "INSERT INTO t (id, v) VALUES (?, ?);",
+            arrayOf<Any>(1, "one"))
+        val statement = SQLCipherStatement(
+            database,
+            "SELECT id, v FROM t;")
+        assertTrue(statement.step())
+
+        val cursor = getCursor(statement)
+        assertNotNull(cursor)
+        assertFalse(cursor!!.isClosed)
+
+        statement.close()
+
+        assertTrue(cursor.isClosed)
+        assertNull(getCursor(statement))
+    }
+
+    private fun getCursor(statement: SQLCipherStatement): Cursor? {
+        val field = SQLCipherStatement::class.java.getDeclaredField("cursor")
+        field.isAccessible = true
+        return field.get(statement) as Cursor?
+    }
+
     private fun exec(sql: String) {
         connection.prepare(sql).use { it.step() }
     }
 
@@ -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
 
@@ -759,10 +759,12 @@ private void cancelConnectionWaiterLocked(ConnectionWaiter waiter) {
     // Can't throw.
     private void logConnectionPoolBusyLocked(long waitMillis, int connectionFlags) {
         final Thread thread = Thread.currentThread();
+        @SuppressWarnings("deprecation")
+        final long threadId = thread.getId();
         StringBuilder msg = new StringBuilder();
         msg.append("The connection pool for database '").append(mConfiguration.label);
         msg.append("' has been unable to grant a connection to thread ");
-        msg.append(thread.getId()).append(" (").append(thread.getName()).append(") ");
+        msg.append(threadId).append(" (").append(thread.getName()).append(") ");
         msg.append("with flags 0x").append(Integer.toHexString(connectionFlags));
         msg.append(" for ").append(waitMillis * 0.001f).append(" seconds.\n");
 
 
@@ -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
@@ -154,6 +172,10 @@ public void clearBindings() {
 
     @Override
     public void close() {
+        if (cursor != null) {
+            cursor.close();
+            cursor = null;
+        }
         closed = true;
     }
 
 
@@ -66,7 +66,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH) 						  \
 
 LOCAL_MODULE:= libsqlcipher
 LOCAL_LDLIBS += -ldl -llog
-LOCAL_LDFLAGS += -Wl,-z,max-page-size=16384
+LOCAL_LDFLAGS += -Wl,-z,max-page-size=16384 -Wl,-z,common-page-size=16384
 ifeq ($(findstring SSL,$(LOCAL_CFLAGS)),SSL)
 LOCAL_STATIC_LIBRARIES += static-libcrypto
 else