From 7d44dbbc4abbbfabe05c2b772d019040705d2585 Mon Sep 17 00:00:00 2001 From: Evan Hahn Date: Thu, 20 Apr 2023 09:45:24 -0500 Subject: [PATCH] Remove unused argument from database method This change should have no user impact. The `name` argument was never used so we can remove it. --- .../Database/GRDBDatabaseStorageAdapter.swift | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/SignalServiceKit/src/Storage/Database/GRDBDatabaseStorageAdapter.swift b/SignalServiceKit/src/Storage/Database/GRDBDatabaseStorageAdapter.swift index 208e9fda9e..91ff7325b1 100644 --- a/SignalServiceKit/src/Storage/Database/GRDBDatabaseStorageAdapter.swift +++ b/SignalServiceKit/src/Storage/Database/GRDBDatabaseStorageAdapter.swift @@ -375,21 +375,14 @@ public class GRDBDatabaseStorageAdapter: NSObject { } } - static func prepareDatabase(db: Database, keyspec: GRDBKeySpecSource, name: String? = nil) throws { - let prefix: String - if let name = name, !name.isEmpty { - prefix = name + "." - } else { - prefix = "" - } - + static func prepareDatabase(db: Database, keyspec: GRDBKeySpecSource) throws { let keyspec = try keyspec.fetchString() - try db.execute(sql: "PRAGMA \(prefix)key = \"\(keyspec)\"") - try db.execute(sql: "PRAGMA \(prefix)cipher_plaintext_header_size = 32") - try db.execute(sql: "PRAGMA \(prefix)checkpoint_fullfsync = ON") + try db.execute(sql: "PRAGMA key = \"\(keyspec)\"") + try db.execute(sql: "PRAGMA cipher_plaintext_header_size = 32") + try db.execute(sql: "PRAGMA checkpoint_fullfsync = ON") // This will use F_BARRIERFSYNC because of our fork of SQLCipher. - try db.execute(sql: "PRAGMA \(prefix)fullfsync = ON") + try db.execute(sql: "PRAGMA fullfsync = ON") if !CurrentAppContext().isMainApp { let perConnectionCacheSizeInKibibytes = 2000 / (GRDBStorage.maximumReaderCountInExtensions + 1) @@ -398,7 +391,7 @@ public class GRDBDatabaseStorageAdapter: NSObject { // The minus sign indicates that this is in KiB rather than the database's page size. // An alternative would be to use SQLite's "shared cache" mode to have a single memory pool, // but unfortunately that changes the locking model in a way GRDB doesn't support. - try db.execute(sql: "PRAGMA \(prefix)cache_size = -\(perConnectionCacheSizeInKibibytes)") + try db.execute(sql: "PRAGMA cache_size = -\(perConnectionCacheSizeInKibibytes)") } } }