Merge pull request #2740 from bblommers/bugfix/#2580
DynamoDB update_item: Allow list_append and if_not_exists-functions in one expression
This commit is contained in:
commit
a0999ced8a
@ -448,13 +448,18 @@ class Item(BaseModel):
|
|||||||
if list_append_re:
|
if list_append_re:
|
||||||
new_value = expression_attribute_values[list_append_re.group(2).strip()]
|
new_value = expression_attribute_values[list_append_re.group(2).strip()]
|
||||||
old_list_key = list_append_re.group(1)
|
old_list_key = list_append_re.group(1)
|
||||||
# Get the existing value
|
# old_key could be a function itself (if_not_exists)
|
||||||
old_list = self.attrs[old_list_key.split(".")[0]]
|
if old_list_key.startswith("if_not_exists"):
|
||||||
if "." in old_list_key:
|
old_list = DynamoType(
|
||||||
# Value is nested inside a map - find the appropriate child attr
|
expression_attribute_values[self._get_default(old_list_key)]
|
||||||
old_list = old_list.child_attr(
|
|
||||||
".".join(old_list_key.split(".")[1:])
|
|
||||||
)
|
)
|
||||||
|
else:
|
||||||
|
old_list = self.attrs[old_list_key.split(".")[0]]
|
||||||
|
if "." in old_list_key:
|
||||||
|
# Value is nested inside a map - find the appropriate child attr
|
||||||
|
old_list = old_list.child_attr(
|
||||||
|
".".join(old_list_key.split(".")[1:])
|
||||||
|
)
|
||||||
if not old_list.is_list():
|
if not old_list.is_list():
|
||||||
raise ParamValidationError
|
raise ParamValidationError
|
||||||
old_list.value.extend([DynamoType(v) for v in new_value["L"]])
|
old_list.value.extend([DynamoType(v) for v in new_value["L"]])
|
||||||
|
@ -3609,6 +3609,31 @@ def test_update_supports_list_append_maps():
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@mock_dynamodb2
|
||||||
|
def test_update_supports_list_append_with_nested_if_not_exists_operation():
|
||||||
|
dynamo = boto3.resource("dynamodb", region_name="us-west-1")
|
||||||
|
table_name = "test"
|
||||||
|
|
||||||
|
dynamo.create_table(
|
||||||
|
TableName=table_name,
|
||||||
|
AttributeDefinitions=[{"AttributeName": "Id", "AttributeType": "S"}],
|
||||||
|
KeySchema=[{"AttributeName": "Id", "KeyType": "HASH"}],
|
||||||
|
ProvisionedThroughput={"ReadCapacityUnits": 20, "WriteCapacityUnits": 20},
|
||||||
|
)
|
||||||
|
|
||||||
|
table = dynamo.Table(table_name)
|
||||||
|
|
||||||
|
table.put_item(Item={"Id": "item-id", "nest1": {"nest2": {}}})
|
||||||
|
table.update_item(
|
||||||
|
Key={"Id": "item-id"},
|
||||||
|
UpdateExpression="SET nest1.nest2.event_history = list_append(if_not_exists(nest1.nest2.event_history, :empty_list), :new_value)",
|
||||||
|
ExpressionAttributeValues={":empty_list": [], ":new_value": ["some_value"]},
|
||||||
|
)
|
||||||
|
table.get_item(Key={"Id": "item-id"})["Item"].should.equal(
|
||||||
|
{"Id": "item-id", "nest1": {"nest2": {"event_history": ["some_value"]}}}
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
@mock_dynamodb2
|
@mock_dynamodb2
|
||||||
def test_update_catches_invalid_list_append_operation():
|
def test_update_catches_invalid_list_append_operation():
|
||||||
client = boto3.client("dynamodb", region_name="us-east-1")
|
client = boto3.client("dynamodb", region_name="us-east-1")
|
||||||
|
Loading…
Reference in New Issue
Block a user