diff --git a/Sources/DynamoQueries/Builders/KeyConditionBuilder.swift b/Sources/DynamoQueries/Builders/KeyConditionBuilder.swift index a86238b..64e7ab8 100644 --- a/Sources/DynamoQueries/Builders/KeyConditionBuilder.swift +++ b/Sources/DynamoQueries/Builders/KeyConditionBuilder.swift @@ -1,11 +1,11 @@ @resultBuilder public struct KeyConditionBuilder { - public static func buildExpression(_ condition: KeyCondition) -> KeyCondition { - condition + public static func buildExpression(_ condition: KeyCondition) -> [KeyCondition] { + [condition] } - public static func buildBlock(_ components: KeyCondition...) -> [KeyCondition] { - Array(components) + public static func buildBlock(_ components: [KeyCondition]...) -> [KeyCondition] { + components.flatMap(\.self) } public static func buildOptional(_ component: [KeyCondition]?) -> [KeyCondition] { diff --git a/Tests/DynamoQueriesTests/QueryEquivalenceTests.swift b/Tests/DynamoQueriesTests/QueryEquivalenceTests.swift index b81b928..564b636 100644 --- a/Tests/DynamoQueriesTests/QueryEquivalenceTests.swift +++ b/Tests/DynamoQueriesTests/QueryEquivalenceTests.swift @@ -61,6 +61,41 @@ struct QueryEquivalenceTests { expectEquivalent(dslSoto, reference) } + @Test("Query: an if includes its sort key condition only when it holds", arguments: [ + "hiker-9", + nil, + ]) + func queryKeyIf(hikerId: String?) async throws { + let client = RecordingDynamoClient() + _ = try await Hike.query { column in + Key { + column.hikeId == "hike-1" + if let hikerId { + column.hikerSeasonGrade.beginsWith(hikerId) + } + } + } + .execute(using: client) + let dslSoto = try #require(await client.lastQueryInput(for: Hike.self)).toSotoQueryInput() + + let reference = hikerId == nil + ? DynamoDB.QueryInput( + expressionAttributeValues: [":hikeId": .s("hike-1")], + keyConditionExpression: "hikeId = :hikeId", + tableName: "TrailHikes" + ) + : DynamoDB.QueryInput( + expressionAttributeValues: [ + ":hikeId": .s("hike-1"), + ":hikerId": .s("hiker-9"), + ], + keyConditionExpression: + "(hikeId = :hikeId) AND (begins_with(hikerSeasonGrade, :hikerId))", + tableName: "TrailHikes" + ) + expectEquivalent(dslSoto, reference) + } + @Test("Query: filter expression on top of a key condition (descending GSI)") func queryWithFilterOnKey() async throws { let client = RecordingDynamoClient()