Light, fluffy, and always free - The AWS Local Emulator alternative
feat(dynamodb): read PartiQL's FROM-first form of UPDATE (#6648)
TATSUNO “Taz” Yasuhirod42b83ceac47
diff --git a/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbPartiQLParser.java b/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbPartiQLParser.javaindex 82ca51a756..e412c7af1d 100644--- a/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbPartiQLParser.java+++ b/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbPartiQLParser.java@@ -128,7 +128,7 @@ public class DynamoDbPartiQLParser {return switch (tokens.getFirst().type()) {case SELECT -> "dynamodb:PartiQLSelect";case INSERT -> "dynamodb:PartiQLInsert";- case UPDATE -> "dynamodb:PartiQLUpdate";+ case UPDATE, FROM -> "dynamodb:PartiQLUpdate";case DELETE -> "dynamodb:PartiQLDelete";default -> null;};@@ -471,9 +471,9 @@ public class DynamoDbPartiQLParser {case SELECT -> parseSelect();case INSERT -> parseInsert();case UPDATE -> parseUpdate();+ case FROM -> parseFromFirstUpdate();case DELETE -> parseDelete();- default -> throw validationEx(- "Statement wasn't well formed, can't be processed: Expected data manipulation");+ default -> throw validationEx(NOT_WELL_FORMED + "Expected data manipulation");};}@@ -548,6 +548,29 @@ public class DynamoDbPartiQLParser {consume(TType.UPDATE);String table = expectTableName();String index = parseIndexQualifier();+ Edits edits = parseEdits();+ consume(TType.WHERE);+ List<Cond> where = parseConditions();+ return new Stmt.Update(table, index, edits.sets(), edits.removes(), where, parseReturning());+ }++ // FROM "Table" [WHERE …] SET attr=val [, …] [REMOVE attr [, …]], an UPDATE with the clauses in PartiQL's order+ private Stmt.Update parseFromFirstUpdate() {+ consume(TType.FROM);+ String table = expectTableName();+ String index = parseIndexQualifier();+ List<Cond> where = List.of();+ if (peek().type() == TType.WHERE) { advance(); where = parseConditions(); }+ Edits edits = parseEdits();+ return new Stmt.Update(table, index, edits.sets(), edits.removes(), where, parseReturning());+ }++ private record Edits(List<SetClause> sets, List<Path> removes) {}++ private Edits parseEdits() {+ if (peek().type() != TType.SET && peek().type() != TType.REMOVE) {+ throw validationEx(NOT_WELL_FORMED + "Expected data manipulation");+ }List<SetClause> sets = new ArrayList<>();List<Path> removes = new ArrayList<>();while (peek().type() == TType.SET || peek().type() == TType.REMOVE) {@@ -561,9 +584,7 @@ public class DynamoDbPartiQLParser {while (peek().type() == TType.COMMA) { advance(); removes.add(parsePath()); }}}- consume(TType.WHERE);- List<Cond> where = parseConditions();- return new Stmt.Update(table, index, sets, removes, where, parseReturning());+ return new Edits(sets, removes);}private Stmt.Delete parseDelete() {diff --git a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbPartiQLFromFirstUpdateIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbPartiQLFromFirstUpdateIntegrationTest.javanew file mode 100644index 0000000000..3190cc780b--- /dev/null+++ b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbPartiQLFromFirstUpdateIntegrationTest.java@@ -0,0 +1,106 @@+package io.github.hectorvent.floci.services.dynamodb;++import com.fasterxml.jackson.databind.node.JsonNodeFactory;+import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;+import io.quarkus.test.junit.QuarkusTest;+import io.restassured.response.ValidatableResponse;+import org.junit.jupiter.api.BeforeAll;+import org.junit.jupiter.api.MethodOrderer;+import org.junit.jupiter.api.Order;+import org.junit.jupiter.api.Test;+import org.junit.jupiter.api.TestMethodOrder;++import static io.github.hectorvent.floci.testing.DynamoDbRequests.ddb;+import static org.hamcrest.Matchers.equalTo;+import static org.hamcrest.Matchers.nullValue;++/**+ * PartiQL's FROM-first form of UPDATE, {@code FROM "T" WHERE key SET ... REMOVE ...}, which+ * DynamoDB runs as the same update as {@code UPDATE "T" SET ... REMOVE ... WHERE key}.+ */+@QuarkusTest+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)+class DynamoDbPartiQLFromFirstUpdateIntegrationTest {++ private static final String TABLE = "partiql-from-first-update";+ private static final String FROM = "FROM \"" + TABLE + "\" ";++ @BeforeAll+ static void configureRestAssured() {+ RestAssuredJsonUtils.configureAwsContentTypes();+ }++ @Test+ @Order(1)+ void updatesTheItemTheWhereNames() {+ ddb("CreateTable", """+ {+ "TableName": "%s",+ "AttributeDefinitions": [{"AttributeName":"pk","AttributeType":"S"}],+ "KeySchema": [{"AttributeName":"pk","KeyType":"HASH"}],+ "BillingMode": "PAY_PER_REQUEST"+ }+ """.formatted(TABLE))+ .statusCode(200);+ seed("ff-set");++ ddb("ExecuteStatement", "{\"Statement\":" + quoted(FROM + "WHERE pk = ? SET c = ? REMOVE b RETURNING ALL NEW *")+ + ",\"Parameters\":[{\"S\":\"ff-set\"},{\"N\":\"7\"}]}")+ .statusCode(200)+ .body("Items[0].c.N", equalTo("7"))+ .body("Items[0].b", nullValue())+ .body("Items[0].a.N", equalTo("1"));+ statement("from \"" + TABLE + "\" where pk = 'ff-set' set d = 1").statusCode(200);+ getItem("ff-set").body("Item.d.N", equalTo("1")).body("Item.c.N", equalTo("7"));+ }++ @Test+ @Order(2)+ void refusesAStatementWithoutAWhereForItsMissingKey() {+ statement(FROM + "SET c = 1")+ .statusCode(400)+ .body("__type", equalTo("ValidationException"))+ .body("message", equalTo("Where clause does not contain a mandatory equality on all key attributes"));+ }++ @Test+ @Order(3)+ void runsInsideATransactionAndABatch() {+ seed("ff-transaction");+ seed("ff-batch");++ ddb("ExecuteTransaction", "{\"TransactStatements\":[{\"Statement\":"+ + quoted(FROM + "WHERE pk = 'ff-transaction' SET c = 1") + "}]}")+ .statusCode(200);+ getItem("ff-transaction").body("Item.c.N", equalTo("1"));++ ddb("BatchExecuteStatement", "{\"Statements\":[{\"Statement\":"+ + quoted(FROM + "WHERE pk = 'ff-batch' SET c = 1") + "}]}")+ .statusCode(200)+ .body("Responses[0].Error", nullValue())+ .body("Responses[0].TableName", equalTo(TABLE));+ getItem("ff-batch").body("Item.c.N", equalTo("1"));+ }++ private static void seed(String pk) {+ ddb("PutItem", """+ {"TableName":"%s","Item":{"pk":{"S":"%s"},"a":{"N":"1"},"b":{"S":"bee"}}}+ """.formatted(TABLE, pk))+ .statusCode(200);+ }++ private static ValidatableResponse statement(String partiql) {+ return ddb("ExecuteStatement", "{\"Statement\":" + quoted(partiql) + "}");+ }++ private static String quoted(String text) {+ return JsonNodeFactory.instance.textNode(text).toString();+ }++ private static ValidatableResponse getItem(String pk) {+ return ddb("GetItem", """+ {"TableName":"%s","Key":{"pk":{"S":"%s"}},"ConsistentRead":true}+ """.formatted(TABLE, pk))+ .statusCode(200);+ }+}diff --git a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbPartiQLParserTest.java b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbPartiQLParserTest.javaindex d94709a805..dcd8b4b36e 100644--- a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbPartiQLParserTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbPartiQLParserTest.java@@ -191,6 +191,46 @@ class DynamoDbPartiQLParserTest {update.removes().getFirst().segments());}+ @Test+ void parsesAFromFirstUpdateAsAnUpdate() {+ Stmt stmt = DynamoDbPartiQLParser.parse(+ "FROM \"t\" WHERE pk = 'p' AND a = 1 SET c = 1, d = 2 REMOVE b RETURNING ALL NEW *", List.of());++ Stmt.Update update = assertInstanceOf(Stmt.Update.class, stmt);+ assertEquals("t", update.table());+ assertEquals(2, update.where().size());+ assertEquals(2, update.sets().size());+ assertEquals("b", update.removes().getFirst().root());+ assertEquals(DynamoDbPartiQLParser.Returning.ALL_NEW, update.returning());+ assertEquals("dynamodb:PartiQLUpdate", DynamoDbPartiQLParser.iamAction("FROM \"t\" WHERE pk = 'p' SET c = 1"));+ }++ @Test+ void parsesAFromFirstUpdateWithoutAWhere() {+ Stmt stmt = DynamoDbPartiQLParser.parse("FROM \"t\" SET c = 1", List.of());++ assertTrue(assertInstanceOf(Stmt.Update.class, stmt).where().isEmpty());+ }++ @ParameterizedTest+ @ValueSource(strings = {"FROM \"t\"", "FROM \"t\" WHERE pk = 'p'", "FROM \"t\" WHERE pk = 'p' RETURNING ALL OLD *",+ "UPDATE \"t\" WHERE pk = 'p'", "UPDATE \"t\" WHERE pk = 'p' SET c = 1"})+ void refusesAnUpdateWhoseSetOrRemoveDoesNotFollowTheTable(String statement) {+ AwsException e = assertThrows(AwsException.class, () -> DynamoDbPartiQLParser.parse(statement, List.of()));++ assertEquals("ValidationException", e.getErrorCode());+ assertEquals("Statement wasn't well formed, can't be processed: Expected data manipulation", e.getMessage());+ }++ @Test+ void readsAWhereAfterTheSetOfAFromFirstUpdateAsALeftoverToken() {+ AwsException e = assertThrows(AwsException.class,+ () -> DynamoDbPartiQLParser.parse("FROM \"t\" SET c = 1 WHERE pk = 'p'", List.of()));++ assertEquals("Statement wasn't well formed, can't be processed: Unexpected token after expression",+ e.getMessage());+ }+@Testvoid keepsABareAttributeNameAsARootOnlyPath() {Path path = assertInstanceOf(Cond.Eq.class, firstCond(SELECT + "= 'x'")).path();