Skip to content

Commit a135af1

Browse files
committed
wip
1 parent 14fadf7 commit a135af1

3 files changed

Lines changed: 9 additions & 8 deletions

File tree

Examples/Reminders/ReminderForm.swift

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,17 +170,18 @@ struct ReminderFormView: View {
170170
private func saveButtonTapped() {
171171
withErrorReporting {
172172
try database.write { db in
173-
var reminder = reminder
174-
let reminderID = try Reminder.upsert(reminder).returning(\.id).fetchOne(db)!
173+
let reminderID = try Reminder.upsert { reminder }
174+
.returning(\.id)
175+
.fetchOne(db)!
175176
try ReminderTag
176177
.where { $0.reminderID.eq(reminderID) }
177178
.delete()
178179
.execute(db)
179-
try ReminderTag.insert(
180+
try ReminderTag.insert {
180181
selectedTags.map { tag in
181182
ReminderTag.Draft(reminderID: reminderID, tagID: tag.id)
182183
}
183-
)
184+
}
184185
.execute(db)
185186
}
186187
}

Examples/Reminders/RemindersListForm.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ struct RemindersListForm: View {
3434
Button("Save") {
3535
withErrorReporting {
3636
try database.write { db in
37-
try RemindersList.upsert(remindersList)
37+
try RemindersList.upsert { remindersList }
3838
.execute(db)
3939
}
4040
}

Sources/SharingGRDBCore/FetchOne.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public struct FetchOne<Value: Sendable>: Sendable {
104104
/// - database: The database to read from. A value of `nil` will use the default database
105105
/// (`@Dependency(\.defaultDatabase)`).
106106
public init(
107-
wrappedValue: sending Value = ._none,
107+
wrappedValue: sending Value,
108108
database: (any DatabaseReader)? = nil
109109
)
110110
where
@@ -435,7 +435,7 @@ extension FetchOne {
435435
/// - scheduler: The scheduler to observe from. By default, database observation is performed
436436
/// asynchronously on the main queue.
437437
public init(
438-
wrappedValue: sending Value = ._none,
438+
wrappedValue: sending Value,
439439
database: (any DatabaseReader)? = nil,
440440
scheduler: some ValueObservationScheduler & Hashable
441441
)
@@ -854,7 +854,7 @@ extension FetchOne: Equatable where Value: Equatable {
854854
/// - animation: The animation to use for user interface changes that result from changes to
855855
/// the fetched results.
856856
public init(
857-
wrappedValue: sending Value = ._none,
857+
wrappedValue: sending Value,
858858
database: (any DatabaseReader)? = nil,
859859
animation: Animation
860860
)

0 commit comments

Comments
 (0)