From 96e89429d581df8ad8ba5696c70c5fc04ed0b579 Mon Sep 17 00:00:00 2001 From: John Connolly Date: Fri, 23 Oct 2026 15:30:10 -0700 Subject: [PATCH] Allow if else expressions in update blocks --- .../Builders/UpdateBuilder.swift | 8 ++- .../QueryEquivalenceTests.swift | 69 +++++++++++++++++++ 2 files changed, 75 insertions(+), 2 deletions(-) diff --git a/Sources/DynamoQueries/Builders/UpdateBuilder.swift b/Sources/DynamoQueries/Builders/UpdateBuilder.swift index 614f871..474a019 100644 --- a/Sources/DynamoQueries/Builders/UpdateBuilder.swift +++ b/Sources/DynamoQueries/Builders/UpdateBuilder.swift @@ -1,7 +1,11 @@ @resultBuilder public struct UpdateBuilder { - public static func buildBlock(_ components: UpdateAction...) -> [UpdateAction] { - Array(components) + public static func buildExpression(_ expression: UpdateAction) -> [UpdateAction] { + [expression] + } + + public static func buildBlock(_ components: [UpdateAction]...) -> [UpdateAction] { + components.flatMap { $0 } } public static func buildOptional(_ component: [UpdateAction]?) -> [UpdateAction] { diff --git a/Tests/DynamoQueriesTests/QueryEquivalenceTests.swift b/Tests/DynamoQueriesTests/QueryEquivalenceTests.swift index 245c2cd..b81b928 100644 --- a/Tests/DynamoQueriesTests/QueryEquivalenceTests.swift +++ b/Tests/DynamoQueriesTests/QueryEquivalenceTests.swift @@ -690,6 +690,75 @@ struct UpdateItemEquivalenceTests { ) expectEquivalent(dslSoto, reference) } + + @Test("UpdateItem: an if includes its actions only when it holds", arguments: [true, false]) + func updateItemIf(isFavorite: Bool) async throws { + let client = RecordingDynamoClient() + try await TrailRoute.update(partitionKey: "route-1") { column in + column.nameLower.set(to: "mist falls") + if isFavorite { + column.isFavorite.set(to: true) + } + column.createdAt.set(to: 1735776000.0) + } + .execute(using: client) + let captured = try #require(await client.lastUpdateInput(for: TrailRoute.self)) + let dslSoto = captured.toSotoUpdateItemInput() + + let reference = isFavorite + ? DynamoDB.UpdateItemInput( + expressionAttributeValues: [ + ":nameLower": .s("mist falls"), + ":isFavorite": .bool(true), + ":createdAt": .n("1735776000.0"), + ], + key: ["routeId": .s("route-1")], + tableName: "TrailRoutes", + updateExpression: + "SET nameLower = :nameLower, isFavorite = :isFavorite, createdAt = :createdAt" + ) + : DynamoDB.UpdateItemInput( + expressionAttributeValues: [ + ":nameLower": .s("mist falls"), + ":createdAt": .n("1735776000.0"), + ], + key: ["routeId": .s("route-1")], + tableName: "TrailRoutes", + updateExpression: "SET nameLower = :nameLower, createdAt = :createdAt" + ) + expectEquivalent(dslSoto, reference) + } + + @Test("UpdateItem: if/else takes one branch's actions", arguments: [true, false]) + func updateItemIfElse(isPrivate: Bool) async throws { + let client = RecordingDynamoClient() + try await TrailRoute.update(partitionKey: "route-1") { column in + if isPrivate { + column.isPrivate.set(to: true) + } else { + column.isPrivate.remove() + column.isFavorite.set(to: false) + } + } + .execute(using: client) + let captured = try #require(await client.lastUpdateInput(for: TrailRoute.self)) + let dslSoto = captured.toSotoUpdateItemInput() + + let reference = isPrivate + ? DynamoDB.UpdateItemInput( + expressionAttributeValues: [":isPrivate": .bool(true)], + key: ["routeId": .s("route-1")], + tableName: "TrailRoutes", + updateExpression: "SET isPrivate = :isPrivate" + ) + : DynamoDB.UpdateItemInput( + expressionAttributeValues: [":isFavorite": .bool(false)], + key: ["routeId": .s("route-1")], + tableName: "TrailRoutes", + updateExpression: "SET isFavorite = :isFavorite REMOVE isPrivate" + ) + expectEquivalent(dslSoto, reference) + } } // MARK: - DeleteItem