Use SQLITE_HAS_CODEC instead of GRDBCIPHER when testing for SQLCipher availability

GRDBCIPHER is now just a marker for importing SQLCipher with CocoaPods.

Author: groue

GRDB/Core/Configuration.swift

@@ -3,7 +3,7 @@
 import GRDBSQLite
 #elseif GRDBCIPHER
 import SQLCipher
-#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+#elseif !GRDBCUSTOMSQLITE && !SQLITE_HAS_CODEC
 import SQLite3
 #endif
 

GRDB/Core/Database+Schema.swift

@@ -3,7 +3,7 @@
 import GRDBSQLite
 #elseif GRDBCIPHER
 import SQLCipher
-#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+#elseif !GRDBCUSTOMSQLITE && !SQLITE_HAS_CODEC
 import SQLite3
 #endif
 
@@ -138,7 +138,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() {
@@ -572,7 +572,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/Database+Statements.swift

@@ -3,7 +3,7 @@
 import GRDBSQLite
 #elseif GRDBCIPHER
 import SQLCipher
-#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+#elseif !GRDBCUSTOMSQLITE && !SQLITE_HAS_CODEC
 import SQLite3
 #endif
 

GRDB/Core/Database.swift

@@ -3,7 +3,7 @@
 import GRDBSQLite
 #elseif GRDBCIPHER
 import SQLCipher
-#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+#elseif !GRDBCUSTOMSQLITE && !SQLITE_HAS_CODEC
 import SQLite3
 #endif
 

GRDB/Core/DatabaseCollation.swift

@@ -3,7 +3,7 @@
 import GRDBSQLite
 #elseif GRDBCIPHER
 import SQLCipher
-#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+#elseif !GRDBCUSTOMSQLITE && !SQLITE_HAS_CODEC
 import SQLite3
 #endif
 

GRDB/Core/DatabaseError.swift

@@ -3,7 +3,7 @@
 import GRDBSQLite
 #elseif GRDBCIPHER
 import SQLCipher
-#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+#elseif !GRDBCUSTOMSQLITE && !SQLITE_HAS_CODEC
 import SQLite3
 #endif
 

GRDB/Core/DatabaseFunction.swift

@@ -3,7 +3,7 @@
 import GRDBSQLite
 #elseif GRDBCIPHER
 import SQLCipher
-#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+#elseif !GRDBCUSTOMSQLITE && !SQLITE_HAS_CODEC
 import SQLite3
 #endif
 

GRDB/Core/DatabasePool.swift

@@ -684,7 +684,7 @@ extension DatabasePool: DatabaseReader {
 
     // MARK: - WAL Snapshot Transactions
 
-#if SQLITE_ENABLE_SNAPSHOT || (!GRDBCUSTOMSQLITE && !GRDBCIPHER)
+#if SQLITE_ENABLE_SNAPSHOT || (!GRDBCUSTOMSQLITE && !SQLITE_HAS_CODEC)
     /// Returns a long-lived WAL snapshot transaction on a reader connection.
     func walSnapshotTransaction() throws -> WALSnapshotTransaction {
         guard let readerPool else {
@@ -950,7 +950,7 @@ extension DatabasePool {
             purpose: "snapshot.\(databaseSnapshotCountMutex.increment())")
     }
 
-#if SQLITE_ENABLE_SNAPSHOT || (!GRDBCUSTOMSQLITE && !GRDBCIPHER)
+#if SQLITE_ENABLE_SNAPSHOT || (!GRDBCUSTOMSQLITE && !SQLITE_HAS_CODEC)
     /// Creates a database snapshot that allows concurrent accesses to an
     /// unchanging database content, as it exists at the moment the snapshot
     /// is created.

GRDB/Core/DatabaseSnapshotPool.swift

@@ -1,10 +1,10 @@
-#if SQLITE_ENABLE_SNAPSHOT || (!GRDBCUSTOMSQLITE && !GRDBCIPHER)
+#if SQLITE_ENABLE_SNAPSHOT || (!GRDBCUSTOMSQLITE && !SQLITE_HAS_CODEC)
 // Import C SQLite functions
 #if SWIFT_PACKAGE
 import GRDBSQLite
 #elseif GRDBCIPHER
 import SQLCipher
-#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+#elseif !GRDBCUSTOMSQLITE && !SQLITE_HAS_CODEC
 import SQLite3
 #endif
 

GRDB/Core/DatabaseValue.swift

@@ -3,7 +3,7 @@
 import GRDBSQLite
 #elseif GRDBCIPHER
 import SQLCipher
-#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+#elseif !GRDBCUSTOMSQLITE && !SQLITE_HAS_CODEC
 import SQLite3
 #endif