Merge pull request #471 from kennethshackleton/sqlcipher-4.5.5

SQLCipher 4.5.5.
bloomberg · Sep 9, 2023 · 20a1fd2 · 20a1fd2
2 parents 9e51b7d + fbac4d6
commit 20a1fd2
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -6,7 +6,7 @@ openssl.version.suffix=u
 openssl.sha256=e2f8d84b523eecd06c7be7626830370300fbcc15386bf5142d72758f6963ebc6
 openssl.pgp.sha256=7f564cada05f055c1534eae3fc7c19864eb2f6831cfcd91546e62476ba99e96e
 
-sqlcipher.versionName=4.5.4
+sqlcipher.versionName=4.5.5
 
 org.gradle.caching=true
 org.gradle.configuration-cache=true

diff --git a/selekt-android/src/main/kotlin/com/bloomberg/selekt/android/SQLite.kt b/selekt-android/src/main/kotlin/com/bloomberg/selekt/android/SQLite.kt
@@ -48,7 +48,6 @@ import com.bloomberg.selekt.SQL_MISUSE
 import com.bloomberg.selekt.SQL_NOMEM
 import com.bloomberg.selekt.SQL_NOT_A_DATABASE
 import com.bloomberg.selekt.SQL_NOT_FOUND
-import com.bloomberg.selekt.SQL_OK
 import com.bloomberg.selekt.SQL_RANGE
 import com.bloomberg.selekt.SQL_READONLY
 import com.bloomberg.selekt.SQL_TOO_BIG
@@ -91,7 +90,6 @@ internal object SQLite : com.bloomberg.selekt.SQLite(sqlite) {
         message: String,
         context: String?
     ): Nothing {
-        require(code != SQL_OK) { "Result code is not an error: $code" }
         val exceptionMessage = extendedErrorMessage(code, extendedCode, message, context)
         throw when (code) {
             SQL_BUSY -> SQLiteDatabaseLockedException(exceptionMessage)

diff --git a/selekt-android/src/test/kotlin/com/bloomberg/selekt/android/SQLiteTest.kt b/selekt-android/src/test/kotlin/com/bloomberg/selekt/android/SQLiteTest.kt
@@ -142,8 +142,10 @@ internal class SQLiteTest {
     }
 
     @Test
-    fun openThenRekeySuccessfully() {
-        assertEquals(SQL_OK, SQLite.rekey(db, otherKey))
+    fun openThenRekeyWithoutKeyFails() {
+        assertFailsWith<SQLiteException> {
+            SQLite.rekey(db, otherKey)
+        }
     }
 
     @Test
@@ -735,7 +737,7 @@ internal class SQLiteTest {
 
     @Test
     fun exceptionForErrorOk() {
-        assertFailsWith<IllegalArgumentException> {
+        assertFailsWith<SQLiteException> {
             SQLite.throwSQLException(SQL_OK, SQL_OK, "")
         }
     }

diff --git a/selekt-android/src/test/kotlin/com/bloomberg/selekt/android/SelektTest.kt b/selekt-android/src/test/kotlin/com/bloomberg/selekt/android/SelektTest.kt
@@ -35,12 +35,12 @@ internal class SelektTest {
 
     @Test
     fun libVersion() {
-        assertEquals("3.41.2", Selekt.sqliteLibVersion())
+        assertEquals("3.42.0", Selekt.sqliteLibVersion())
     }
 
     @Test
     fun libVersionNumber() {
-        assertEquals(3_041_002, Selekt.sqliteLibVersionNumber())
+        assertEquals(3_042_000, Selekt.sqliteLibVersionNumber())
     }
 
     @OptIn(Experimental::class)

diff --git a/selekt-java/src/main/kotlin/com/bloomberg/selekt/SQLite.kt b/selekt-java/src/main/kotlin/com/bloomberg/selekt/SQLite.kt
@@ -260,26 +260,26 @@ open class SQLite(
         throwSQLException(errorCode(db), extendedErrorCode(db), errorMessage(db), context)
 
     private fun checkSQLCode(code: SQLCode): SQLCode = when (code) {
-        SQL_OK -> code
+        SQL_OK -> SQL_OK
         else -> throwSQLException(code, -1, "Error information not accessible.")
     }
 
     private fun checkConnectionSQLCode(db: Long, code: SQLCode): SQLCode {
         if (SQL_OK == code) {
-            return code
+            return SQL_OK
         }
         throwSQLException(db)
     }
 
     private fun checkStatementSQLCode(statement: Long, code: SQLCode): SQLCode = if (SQL_OK == code) {
-        code
+        SQL_OK
     } else {
         throwSQLException(databaseHandle(statement))
     }
 
     private fun checkBindSQLCode(statement: Long, code: SQLCode): SQLCode {
         if (SQL_OK == code) {
-            return code
+            return SQL_OK
         }
         throwSQLException(databaseHandle(statement))
     }

diff --git a/selekt-sqlite3/src/main/external/sqlcipher b/selekt-sqlite3/src/main/external/sqlcipher