From 5caa92893f070c2f9bc027a53c8d05537be8d9ff Mon Sep 17 00:00:00 2001 From: Max Radermacher Date: Wed, 29 Oct 2025 15:04:12 -0500 Subject: [PATCH] Remove anyExists --- Scripts/sds_codegen/sds_generate.py | 26 ------------------- ...isappearingMessagesConfiguration+SDS.swift | 19 -------------- SignalServiceKit/Contacts/TSThread+SDS.swift | 19 -------------- .../Interactions/InteractionStore.swift | 7 ----- .../Interactions/TSInteraction+SDS.swift | 19 -------------- .../Stickers/InstalledSticker+SDS.swift | 19 -------------- .../Messages/Stickers/StickerPack+SDS.swift | 19 -------------- .../Payments/TSPaymentModel+SDS.swift | 19 -------------- 8 files changed, 147 deletions(-) diff --git a/Scripts/sds_codegen/sds_generate.py b/Scripts/sds_codegen/sds_generate.py index 65fb190765..0c67f7c74a 100755 --- a/Scripts/sds_codegen/sds_generate.py +++ b/Scripts/sds_codegen/sds_generate.py @@ -2201,35 +2201,9 @@ public extension %(class_name)s { class func anyCount(transaction: DBReadTransaction) -> UInt { return %s.ows_fetchCount(transaction.database) } -""" % ( - record_name, - ) - - # ---- Exists ---- - - swift_body += """ - class func anyExists( - uniqueId: String, - transaction: DBReadTransaction - ) -> Bool { - assert(!uniqueId.isEmpty) - - let sql = "SELECT EXISTS ( SELECT 1 FROM \\(%s.databaseTableName) WHERE \\(%sColumn: .uniqueId) = ? )" - let arguments: StatementArguments = [uniqueId] - do { - return try Bool.fetchOne(transaction.database, sql: sql, arguments: arguments) ?? false - } catch { - DatabaseCorruptionState.flagDatabaseReadCorruptionIfNecessary( - userDefaults: CurrentAppContext().appUserDefaults(), - error: error - ) - owsFail("Missing instance.") - } - } } """ % ( record_name, - record_identifier(clazz.name), ) # ---- Fetch ---- diff --git a/SignalServiceKit/Contacts/OWSDisappearingMessagesConfiguration+SDS.swift b/SignalServiceKit/Contacts/OWSDisappearingMessagesConfiguration+SDS.swift index 0ccdaa9e4d..8815b12310 100644 --- a/SignalServiceKit/Contacts/OWSDisappearingMessagesConfiguration+SDS.swift +++ b/SignalServiceKit/Contacts/OWSDisappearingMessagesConfiguration+SDS.swift @@ -412,25 +412,6 @@ public extension OWSDisappearingMessagesConfiguration { class func anyCount(transaction: DBReadTransaction) -> UInt { return DisappearingMessagesConfigurationRecord.ows_fetchCount(transaction.database) } - - class func anyExists( - uniqueId: String, - transaction: DBReadTransaction - ) -> Bool { - assert(!uniqueId.isEmpty) - - let sql = "SELECT EXISTS ( SELECT 1 FROM \(DisappearingMessagesConfigurationRecord.databaseTableName) WHERE \(disappearingMessagesConfigurationColumn: .uniqueId) = ? )" - let arguments: StatementArguments = [uniqueId] - do { - return try Bool.fetchOne(transaction.database, sql: sql, arguments: arguments) ?? false - } catch { - DatabaseCorruptionState.flagDatabaseReadCorruptionIfNecessary( - userDefaults: CurrentAppContext().appUserDefaults(), - error: error - ) - owsFail("Missing instance.") - } - } } // MARK: - Swift Fetch diff --git a/SignalServiceKit/Contacts/TSThread+SDS.swift b/SignalServiceKit/Contacts/TSThread+SDS.swift index 9ccbdff040..bc814f4f5f 100644 --- a/SignalServiceKit/Contacts/TSThread+SDS.swift +++ b/SignalServiceKit/Contacts/TSThread+SDS.swift @@ -925,25 +925,6 @@ public extension TSThread { class func anyCount(transaction: DBReadTransaction) -> UInt { return ThreadRecord.ows_fetchCount(transaction.database) } - - class func anyExists( - uniqueId: String, - transaction: DBReadTransaction - ) -> Bool { - assert(!uniqueId.isEmpty) - - let sql = "SELECT EXISTS ( SELECT 1 FROM \(ThreadRecord.databaseTableName) WHERE \(threadColumn: .uniqueId) = ? )" - let arguments: StatementArguments = [uniqueId] - do { - return try Bool.fetchOne(transaction.database, sql: sql, arguments: arguments) ?? false - } catch { - DatabaseCorruptionState.flagDatabaseReadCorruptionIfNecessary( - userDefaults: CurrentAppContext().appUserDefaults(), - error: error - ) - owsFail("Missing instance.") - } - } } // MARK: - Swift Fetch diff --git a/SignalServiceKit/Messages/Interactions/InteractionStore.swift b/SignalServiceKit/Messages/Interactions/InteractionStore.swift index b21327bbad..95a0e4f3d1 100644 --- a/SignalServiceKit/Messages/Interactions/InteractionStore.swift +++ b/SignalServiceKit/Messages/Interactions/InteractionStore.swift @@ -11,9 +11,6 @@ public protocol InteractionStore { // MARK: - - /// Whether an interaction exists with the given unique ID. - func exists(uniqueId: String, tx: DBReadTransaction) -> Bool - /// Fetch the interaction with the given SQLite row ID, if one exists. func fetchInteraction( rowId interactionRowId: Int64, @@ -108,10 +105,6 @@ public class InteractionStoreImpl: InteractionStore { // MARK: - - public func exists(uniqueId: String, tx: DBReadTransaction) -> Bool { - return TSInteraction.anyExists(uniqueId: uniqueId, transaction: SDSDB.shimOnlyBridge(tx)) - } - public func fetchInteraction( rowId interactionRowId: Int64, tx: DBReadTransaction diff --git a/SignalServiceKit/Messages/Interactions/TSInteraction+SDS.swift b/SignalServiceKit/Messages/Interactions/TSInteraction+SDS.swift index 78d61ebc32..47cdd5126b 100644 --- a/SignalServiceKit/Messages/Interactions/TSInteraction+SDS.swift +++ b/SignalServiceKit/Messages/Interactions/TSInteraction+SDS.swift @@ -5517,25 +5517,6 @@ public extension TSInteraction { class func anyCount(transaction: DBReadTransaction) -> UInt { return InteractionRecord.ows_fetchCount(transaction.database) } - - class func anyExists( - uniqueId: String, - transaction: DBReadTransaction - ) -> Bool { - assert(!uniqueId.isEmpty) - - let sql = "SELECT EXISTS ( SELECT 1 FROM \(InteractionRecord.databaseTableName) WHERE \(interactionColumn: .uniqueId) = ? )" - let arguments: StatementArguments = [uniqueId] - do { - return try Bool.fetchOne(transaction.database, sql: sql, arguments: arguments) ?? false - } catch { - DatabaseCorruptionState.flagDatabaseReadCorruptionIfNecessary( - userDefaults: CurrentAppContext().appUserDefaults(), - error: error - ) - owsFail("Missing instance.") - } - } } // MARK: - Swift Fetch diff --git a/SignalServiceKit/Messages/Stickers/InstalledSticker+SDS.swift b/SignalServiceKit/Messages/Stickers/InstalledSticker+SDS.swift index a0779d073b..d27aaea3cc 100644 --- a/SignalServiceKit/Messages/Stickers/InstalledSticker+SDS.swift +++ b/SignalServiceKit/Messages/Stickers/InstalledSticker+SDS.swift @@ -429,25 +429,6 @@ public extension InstalledSticker { class func anyCount(transaction: DBReadTransaction) -> UInt { return InstalledStickerRecord.ows_fetchCount(transaction.database) } - - class func anyExists( - uniqueId: String, - transaction: DBReadTransaction - ) -> Bool { - assert(!uniqueId.isEmpty) - - let sql = "SELECT EXISTS ( SELECT 1 FROM \(InstalledStickerRecord.databaseTableName) WHERE \(installedStickerColumn: .uniqueId) = ? )" - let arguments: StatementArguments = [uniqueId] - do { - return try Bool.fetchOne(transaction.database, sql: sql, arguments: arguments) ?? false - } catch { - DatabaseCorruptionState.flagDatabaseReadCorruptionIfNecessary( - userDefaults: CurrentAppContext().appUserDefaults(), - error: error - ) - owsFail("Missing instance.") - } - } } // MARK: - Swift Fetch diff --git a/SignalServiceKit/Messages/Stickers/StickerPack+SDS.swift b/SignalServiceKit/Messages/Stickers/StickerPack+SDS.swift index 4608e60e2c..ce927d9780 100644 --- a/SignalServiceKit/Messages/Stickers/StickerPack+SDS.swift +++ b/SignalServiceKit/Messages/Stickers/StickerPack+SDS.swift @@ -452,25 +452,6 @@ public extension StickerPack { class func anyCount(transaction: DBReadTransaction) -> UInt { return StickerPackRecord.ows_fetchCount(transaction.database) } - - class func anyExists( - uniqueId: String, - transaction: DBReadTransaction - ) -> Bool { - assert(!uniqueId.isEmpty) - - let sql = "SELECT EXISTS ( SELECT 1 FROM \(StickerPackRecord.databaseTableName) WHERE \(stickerPackColumn: .uniqueId) = ? )" - let arguments: StatementArguments = [uniqueId] - do { - return try Bool.fetchOne(transaction.database, sql: sql, arguments: arguments) ?? false - } catch { - DatabaseCorruptionState.flagDatabaseReadCorruptionIfNecessary( - userDefaults: CurrentAppContext().appUserDefaults(), - error: error - ) - owsFail("Missing instance.") - } - } } // MARK: - Swift Fetch diff --git a/SignalServiceKit/Payments/TSPaymentModel+SDS.swift b/SignalServiceKit/Payments/TSPaymentModel+SDS.swift index 06fef46227..8d34788c51 100644 --- a/SignalServiceKit/Payments/TSPaymentModel+SDS.swift +++ b/SignalServiceKit/Payments/TSPaymentModel+SDS.swift @@ -529,25 +529,6 @@ public extension TSPaymentModel { class func anyCount(transaction: DBReadTransaction) -> UInt { return PaymentModelRecord.ows_fetchCount(transaction.database) } - - class func anyExists( - uniqueId: String, - transaction: DBReadTransaction - ) -> Bool { - assert(!uniqueId.isEmpty) - - let sql = "SELECT EXISTS ( SELECT 1 FROM \(PaymentModelRecord.databaseTableName) WHERE \(paymentModelColumn: .uniqueId) = ? )" - let arguments: StatementArguments = [uniqueId] - do { - return try Bool.fetchOne(transaction.database, sql: sql, arguments: arguments) ?? false - } catch { - DatabaseCorruptionState.flagDatabaseReadCorruptionIfNecessary( - userDefaults: CurrentAppContext().appUserDefaults(), - error: error - ) - owsFail("Missing instance.") - } - } } // MARK: - Swift Fetch