mirrors/Signal-iOS
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-iOS.git synced 2025-12-05 01:10:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix SDS codegen for the one transaction type…

Browse Source
This commit is contained in:
Max Radermacher
2025-04-23 14:29:06 -05:00
committed by GitHub
parent 34eb52b210
commit 77244d3a37
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Scripts/sds_codegen/sds_generate.py
View File

@@ -1996,7 +1996,7 @@ public class %sCursor: NSObject, SDSCursor {
if cache_code is not None:
swift_body += """
let value = try %s.fromRecord(record)
%s(value, transaction: transaction.asAnyRead)
%s(value, transaction: transaction)
return value""" % (
str(clazz.name),
cache_code,
@@ -2035,7 +2035,7 @@ public class %sCursor: NSObject, SDSCursor {
public extension %(class_name)s {
@nonobjc
class func grdbFetchCursor(transaction: DBReadTransaction) -> %(class_name)sCursor {
let database = transaction.databaseConnection
let database = transaction.database
do {
let cursor = try %(record_name)s.fetchCursor(database)
return %(class_name)sCursor(transaction: transaction, cursor: cursor)
@@ -2211,7 +2211,7 @@ public extension %(class_name)s {
swift_body += """
class func anyCount(transaction: DBReadTransaction) -> UInt {
return %s.ows_fetchCount(transaction.databaseConnection)
return %s.ows_fetchCount(transaction.database)
}
""" % (
record_name,
@@ -2250,7 +2250,7 @@ public extension %(class_name)s {
let sql = "SELECT EXISTS ( SELECT 1 FROM \\(%s.databaseTableName) WHERE \\(%sColumn: .uniqueId) = ? )"
let arguments: StatementArguments = [uniqueId]
do {
return try Bool.fetchOne(transaction.databaseConnection, sql: sql, arguments: arguments) ?? false
return try Bool.fetchOne(transaction.database, sql: sql, arguments: arguments) ?? false
} catch {
DatabaseCorruptionState.flagDatabaseReadCorruptionIfNecessary(
userDefaults: CurrentAppContext().appUserDefaults(),
@@ -2276,7 +2276,7 @@ public extension %(class_name)s {
transaction: DBReadTransaction) -> %(class_name)sCursor {
do {
let sqlRequest = SQLRequest<Void>(sql: sql, arguments: arguments, cached: true)
let cursor = try %(record_name)s.fetchCursor(transaction.databaseConnection, sqlRequest)
let cursor = try %(record_name)s.fetchCursor(transaction.database, sqlRequest)
return %(class_name)sCursor(transaction: transaction, cursor: cursor)
} catch {
DatabaseCorruptionState.flagDatabaseReadCorruptionIfNecessary(
@@ -2301,7 +2301,7 @@ public extension %(class_name)s {
do {
let sqlRequest = SQLRequest<Void>(sql: sql, arguments: arguments, cached: true)
guard let record = try %s.fetchOne(transaction.databaseConnection, sqlRequest) else {
guard let record = try %s.fetchOne(transaction.database, sqlRequest) else {
return nil
}
""" % (
@@ -2313,7 +2313,7 @@ public extension %(class_name)s {
if cache_code is not None:
swift_body += """
let value = try %s.fromRecord(record)
%s(value, transaction: transaction.asAnyRead)
%s(value, transaction: transaction)
return value""" % (
str(clazz.name),
cache_code,