diff --git a/DB/Package.swift b/DB/Package.swift index 1f19512..98d168c 100644 --- a/DB/Package.swift +++ b/DB/Package.swift @@ -14,7 +14,7 @@ let package = Package( targets: ["DB"]) ], dependencies: [ - .package(name: "GRDB", url: "https://github.com/metabolist/GRDB.swift.git", .revision("c326f8b")), + .package(name: "GRDB", url: "https://github.com/metabolist/GRDB.swift.git", .revision("a6ff285")), .package(path: "Mastodon"), .package(path: "Secrets") ], diff --git a/DB/Sources/DB/Content/ContentDatabase.swift b/DB/Sources/DB/Content/ContentDatabase.swift index 223949b..a428758 100644 --- a/DB/Sources/DB/Content/ContentDatabase.swift +++ b/DB/Sources/DB/Content/ContentDatabase.swift @@ -21,7 +21,7 @@ public struct ContentDatabase { self.id = id if inMemory { - databaseWriter = DatabaseQueue() + databaseWriter = try DatabaseQueue() try Self.migrator.migrate(databaseWriter) } else { databaseWriter = try DatabasePool.withFileCoordinator( @@ -325,7 +325,7 @@ public extension ContentDatabase { } func createList(_ list: List) -> AnyPublisher { - databaseWriter.mutatingPublisher(updates: TimelineRecord(timeline: Timeline.list(list)).save) + databaseWriter.mutatingPublisher{ try TimelineRecord(timeline: Timeline.list(list)).save($0) } } func deleteList(id: List.Id) -> AnyPublisher { @@ -343,7 +343,7 @@ public extension ContentDatabase { } func createFilter(_ filter: Filter) -> AnyPublisher { - databaseWriter.mutatingPublisher(updates: filter.save) + databaseWriter.mutatingPublisher { try filter.save($0) } } func deleteFilter(id: Filter.Id) -> AnyPublisher { @@ -351,7 +351,7 @@ public extension ContentDatabase { } func setLastReadId(_ id: String, timelineId: Timeline.Id) -> AnyPublisher { - databaseWriter.mutatingPublisher(updates: LastReadIdRecord(timelineId: timelineId, id: id).save) + databaseWriter.mutatingPublisher { try LastReadIdRecord(timelineId: timelineId, id: id).save($0) } } func insert(notifications: [MastodonNotification]) -> AnyPublisher { diff --git a/DB/Sources/DB/Identity/IdentityDatabase.swift b/DB/Sources/DB/Identity/IdentityDatabase.swift index f37a88b..3bf954a 100644 --- a/DB/Sources/DB/Identity/IdentityDatabase.swift +++ b/DB/Sources/DB/Identity/IdentityDatabase.swift @@ -16,7 +16,7 @@ public struct IdentityDatabase { public init(inMemory: Bool, appGroup: String, keychain: Keychain.Type) throws { if inMemory { - databaseWriter = DatabaseQueue() + databaseWriter = try DatabaseQueue() try Self.migrator.migrate(databaseWriter) } else { let url = try FileManager.default.databaseDirectoryURL( @@ -32,8 +32,8 @@ public struct IdentityDatabase { public extension IdentityDatabase { func createIdentity(id: Identity.Id, url: URL, authenticated: Bool, pending: Bool) -> AnyPublisher { - databaseWriter.mutatingPublisher( - updates: IdentityRecord( + databaseWriter.mutatingPublisher { + try IdentityRecord( id: id, url: url, authenticated: authenticated, @@ -43,7 +43,8 @@ public extension IdentityDatabase { instanceURI: nil, lastRegisteredDeviceToken: nil, pushSubscriptionAlerts: .initial) - .save) + .save($0) + } } func deleteIdentity(id: Identity.Id) -> AnyPublisher { @@ -75,8 +76,8 @@ public extension IdentityDatabase { } func updateAccount(_ account: Account, id: Identity.Id) -> AnyPublisher { - databaseWriter.mutatingPublisher( - updates: Identity.Account( + databaseWriter.mutatingPublisher { + try Identity.Account( id: account.id, identityId: id, username: account.username, @@ -88,7 +89,8 @@ public extension IdentityDatabase { headerStatic: account.headerStatic, emojis: account.emojis, followRequestCount: account.source?.followRequestsCount ?? 0) - .save) + .save($0) + } } func confirmIdentity(id: Identity.Id) -> AnyPublisher { diff --git a/Metatext.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Metatext.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 708e608..74f4696 100644 --- a/Metatext.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Metatext.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -41,8 +41,8 @@ "package": "GRDB", "repositoryURL": "https://github.com/metabolist/GRDB.swift.git", "state": { - "branch": "c326f8b", - "revision": "c326f8bf11ada58f1958e11ae151802c78142f42", + "branch": "a6ff285", + "revision": "a6ff285eb1b0f8933c610b82e8d6ca7093fd7997", "version": null } },