catalin/moto
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

#2527 - DynamoDB - Allow nested attributes in ProjectionExpressions

Browse source
This commit is contained in:
Bert Blommers 2019-11-03 14:02:25 +00:00
commit 6a601d7d5c
3 changed files with 305 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

33
moto/dynamodb2/responses.py
View file

@ -346,9 +346,7 @@ class DynamoHandler(BaseResponse):
projection_expression = self.body.get("ProjectionExpression")
expression_attribute_names = self.body.get("ExpressionAttributeNames", {})
projection_expression = self._adjust_projection_expression(
projection_expression, expression_attribute_names
)
projection_expression = self._adjust_projection_expression(projection_expression, expression_attribute_names)
try:
item = self.dynamodb_backend.get_item(name, key, projection_expression)
@ -415,9 +413,7 @@ class DynamoHandler(BaseResponse):
filter_expression = self.body.get("FilterExpression")
expression_attribute_values = self.body.get("ExpressionAttributeValues", {})
projection_expression = self._adjust_projection_expression(
projection_expression, expression_attribute_names
)
projection_expression = self._adjust_projection_expression(projection_expression, expression_attribute_names)
filter_kwargs = {}
@ -571,25 +567,12 @@ class DynamoHandler(BaseResponse):
return dynamo_json_dump(result)
def _adjust_projection_expression(
self, projection_expression, expression_attribute_names
):
if projection_expression and expression_attribute_names:
expressions = [x.strip() for x in projection_expression.split(",")]
projection_expr = None
for expression in expressions:
if projection_expr is not None:
projection_expr = projection_expr + ", "
else:
projection_expr = ""
if expression in expression_attribute_names:
projection_expr = (
projection_expr + expression_attribute_names[expression]
)
else:
projection_expr = projection_expr + expression
return projection_expr
def _adjust_projection_expression(self, projection_expression, expr_attr_names):
def _adjust(expression):
return expr_attr_names[expression] if expression in expr_attr_names else expression
if projection_expression and expr_attr_names:
expressions = [x.strip() for x in projection_expression.split(',')]
return ','.join(['.'.join([_adjust(expr) for expr in nested_expr.split('.')]) for nested_expr in expressions])
return projection_expression