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

fix decoding keys in query condition

Browse source
This commit is contained in:
Peter Gorniak 2016-11-29 14:04:23 -08:00
commit 2c50561563
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
moto/dynamodb2/responses.py
View file

@ -279,19 +279,22 @@ class DynamoHandler(BaseResponse):
else:
index = table.schema
key_map = [column for _, column in sorted((k, v) for k, v in self.body['ExpressionAttributeNames'].items())]
reverse_attribute_lookup = {v: k for k, v in self.body['ExpressionAttributeNames'].iteritems()}
if " AND " in key_condition_expression:
expressions = key_condition_expression.split(" AND ", 1)
index_hash_key = [key for key in index if key['KeyType'] == 'HASH'][0]
hash_key_index_in_key_map = key_map.index(index_hash_key['AttributeName'])
hash_key_var = reverse_attribute_lookup.get(index_hash_key['AttributeName'], index_hash_key['AttributeName'])
i, hash_key_expression = ((i, e) for i, e in enumerate(expressions) if re.search(r'[\s(]#n1\b'.format(hash_key_var), e)).next()
hash_key_expression = hash_key_expression.strip('()')
expressions.pop(i)
hash_key_expression = expressions.pop(hash_key_index_in_key_map).strip('()')
# TODO implement more than one range expression and OR operators
range_key_expression = expressions[0].strip('()')
range_key_expression_components = range_key_expression.split()
range_comparison = range_key_expression_components[1]
if 'AND' in range_key_expression:
range_comparison = 'BETWEEN'
range_values = [