Merge pull request #1819 from groue/dev/SQLCipher-cleanup

Accept multiple SQLCipher libraries

Author: groue

GRDB/Core/Database+Schema.swift

@@ -141,7 +141,7 @@ extension Database {
         }
     }
 
-#if GRDBCUSTOMSQLITE || GRDBCIPHER
+#if GRDBCUSTOMSQLITE || SQLITE_HAS_CODEC
     /// Returns information about a table or a view
     func table(_ tableName: String) throws -> TableInfo? {
         for schemaID in try fetchSchemaIdentifiers() {
@@ -575,7 +575,7 @@ extension Database {
     /// - precondition: table exists.
     private func fetchTableHasRowID(_ table: DatabaseObjectID) throws -> Bool {
         // Prefer PRAGMA table_list if available
-#if GRDBCUSTOMSQLITE || GRDBCIPHER
+#if GRDBCUSTOMSQLITE || SQLITE_HAS_CODEC
         // Maybe SQLCipher is too old: check actual version
         if sqlite3_libversion_number() >= 3037000 {
             return try self.table(for: table)!.isWithoutRowIDTable == false

GRDB/Core/DatabaseWriter.swift

@@ -552,7 +552,7 @@ extension DatabaseWriter {
     // This method is declared on DatabaseWriter instead of DatabaseReader,
     // so that it is not available on DatabaseSnaphot. VACUUM INTO is not
     // available inside the transaction that is kept open by DatabaseSnaphot.
-#if GRDBCUSTOMSQLITE || GRDBCIPHER
+#if GRDBCUSTOMSQLITE || SQLITE_HAS_CODEC
     /// Creates a new database file at the specified path with a minimum
     /// amount of disk space.
     ///
@@ -665,7 +665,7 @@ extension DatabaseWriter {
         try await writeWithoutTransaction { try $0.execute(sql: "VACUUM") }
     }
 
-#if GRDBCUSTOMSQLITE || GRDBCIPHER
+#if GRDBCUSTOMSQLITE || SQLITE_HAS_CODEC
     /// Creates a new database file at the specified path with a minimum
     /// amount of disk space.
     ///

GRDB/Dump/Database+Dump.swift

@@ -324,7 +324,7 @@ extension Database {
     }
 
     private func isShadowTable(_ tableName: String) throws -> Bool {
-#if GRDBCUSTOMSQLITE || GRDBCIPHER
+#if GRDBCUSTOMSQLITE || SQLITE_HAS_CODEC
         // Maybe SQLCipher is too old: check actual version
         if Database.sqliteLibVersionNumber >= 3037000 {
             guard let table = try table(tableName) else {

GRDB/FTS/FTS3.swift

@@ -40,11 +40,11 @@ public struct FTS3 {
         /// the `remove_diacritics=1` tokenizer argument.
         case removeLegacy
 
-        #if GRDBCUSTOMSQLITE
+        #if GRDBCUSTOMSQLITE || SQLITE_HAS_CODEC
         /// Remove diacritics from Latin script characters. This option matches
         /// the `remove_diacritics=2` tokenizer argument.
         case remove
-        #elseif !GRDBCIPHER
+        #else
         /// Remove diacritics from Latin script characters. This option matches
         /// the `remove_diacritics=2` tokenizer argument.
         @available(iOS 14, macOS 10.16, tvOS 14, *) // SQLite 3.27+

GRDB/FTS/FTS3TokenizerDescriptor.swift

@@ -95,10 +95,10 @@ public struct FTS3TokenizerDescriptor: Sendable {
             break
         case .keep:
             arguments.append("remove_diacritics=0")
-        #if GRDBCUSTOMSQLITE
+        #if GRDBCUSTOMSQLITE || SQLITE_HAS_CODEC
         case .remove:
             arguments.append("remove_diacritics=2")
-        #elseif !GRDBCIPHER
+        #else
         case .remove:
             arguments.append("remove_diacritics=2")
         #endif

GRDB/FTS/FTS5.swift

@@ -63,12 +63,12 @@ public struct FTS5 {
         /// Remove diacritics from Latin script characters. This
         /// option matches the raw "remove_diacritics=1" tokenizer argument.
         case removeLegacy
-        #if GRDBCUSTOMSQLITE
+        #if GRDBCUSTOMSQLITE || SQLITE_HAS_CODEC
         /// Remove diacritics from Latin script characters. This
         /// option matches the raw "remove_diacritics=2" tokenizer argument,
         /// available from SQLite 3.27.0
         case remove
-        #elseif !GRDBCIPHER
+        #else
         /// Remove diacritics from Latin script characters. This
         /// option matches the raw "remove_diacritics=2" tokenizer argument,
         /// available from SQLite 3.27.0

GRDB/FTS/FTS5TokenizerDescriptor.swift

@@ -182,10 +182,10 @@ public struct FTS5TokenizerDescriptor: Sendable {
             break
         case .keep:
             components.append(contentsOf: ["remove_diacritics", "0"])
-        #if GRDBCUSTOMSQLITE
+        #if GRDBCUSTOMSQLITE || SQLITE_HAS_CODEC
         case .remove:
             components.append(contentsOf: ["remove_diacritics", "2"])
-        #elseif !GRDBCIPHER
+        #else
         case .remove:
             components.append(contentsOf: ["remove_diacritics", "2"])
         #endif

GRDB/JSON/SQLJSONExpressible.swift

@@ -154,7 +154,7 @@ extension SQLSpecificExpressible {
     }
 }
 
-#if GRDBCUSTOMSQLITE || GRDBCIPHER
+#if GRDBCUSTOMSQLITE || SQLITE_HAS_CODEC
 extension SQLJSONExpressible {
     /// The `->>` SQL operator.
     ///

GRDB/JSON/SQLJSONFunctions.swift

@@ -1,4 +1,4 @@
-#if GRDBCUSTOMSQLITE || GRDBCIPHER
+#if GRDBCUSTOMSQLITE || SQLITE_HAS_CODEC
 // MARK: - JSON
 
 extension Database {

GRDB/QueryInterface/Request/QueryInterfaceRequest.swift

@@ -646,7 +646,7 @@ extension QueryInterfaceRequest {
 // MARK: - Batch Delete and Fetch
 
 extension QueryInterfaceRequest {
-#if GRDBCUSTOMSQLITE || GRDBCIPHER
+#if GRDBCUSTOMSQLITE || SQLITE_HAS_CODEC
     /// Returns a `DELETE RETURNING` prepared statement.
     ///
     /// For example:
@@ -1176,7 +1176,7 @@ extension QueryInterfaceRequest {
 // MARK: - Batch Update and Fetch
 
 extension QueryInterfaceRequest {
-#if GRDBCUSTOMSQLITE || GRDBCIPHER
+#if GRDBCUSTOMSQLITE || SQLITE_HAS_CODEC
     /// Returns an `UPDATE RETURNING` prepared statement.
     ///
     /// For example: