Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DynamoDB: Support declaration of non-key attributes (#5919)

Browse Source
This commit is contained in:
Bert Blommers 2023-02-11 10:51:37 -01:00 committed by GitHub
parent 11ccbd0b9f
commit 2d4564b58c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 44 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
moto/dynamodb/models/table.py
View File

@ -251,7 +251,7 @@ class Table(CloudFormationModel):
if elem["KeyType"] == "HASH": if elem["KeyType"] == "HASH":
self.hash_key_attr = elem["AttributeName"] self.hash_key_attr = elem["AttributeName"]
self.hash_key_type = attr_type self.hash_key_type = attr_type
else: elif elem["KeyType"] == "RANGE":
self.range_key_attr = elem["AttributeName"] self.range_key_attr = elem["AttributeName"]
self.range_key_type = attr_type self.range_key_type = attr_type
self.table_key_attrs = [ self.table_key_attrs = [
@ -465,7 +465,7 @@ class Table(CloudFormationModel):
@property @property
def range_key_names(self) -> List[str]: def range_key_names(self) -> List[str]:
keys = [self.range_key_attr] keys = [self.range_key_attr] if self.has_range_key else []
for index in self.global_indexes: for index in self.global_indexes:
for key in index.schema: for key in index.schema:
if key["KeyType"] == "RANGE": if key["KeyType"] == "RANGE":

2
tests/test_dynamodb/exceptions/test_dynamodb_exceptions.py
View File

@ -707,7 +707,7 @@ def test_batch_put_item_with_empty_value():
TableName="test-table", TableName="test-table",
KeySchema=[ KeySchema=[
{"AttributeName": "pk", "KeyType": "HASH"}, {"AttributeName": "pk", "KeyType": "HASH"},
{"AttributeName": "sk", "KeyType": "SORT"}, {"AttributeName": "sk", "KeyType": "RANGE"},
], ],
ProvisionedThroughput={"ReadCapacityUnits": 5, "WriteCapacityUnits": 5}, ProvisionedThroughput={"ReadCapacityUnits": 5, "WriteCapacityUnits": 5},
) )

42
tests/test_dynamodb/test_dynamodb_create_table.py
View File

@ -4,8 +4,9 @@ import sure # noqa # pylint: disable=unused-import
from datetime import datetime from datetime import datetime
import pytest import pytest
from moto import mock_dynamodb from moto import mock_dynamodb, settings
from moto.core import DEFAULT_ACCOUNT_ID as ACCOUNT_ID from moto.core import DEFAULT_ACCOUNT_ID as ACCOUNT_ID
from moto.dynamodb.models import dynamodb_backends
@mock_dynamodb @mock_dynamodb
@ -404,3 +405,42 @@ def test_create_table_with_ssespecification__custom_kms_key():
actual["SSEDescription"].should.have.key("Status").equals("ENABLED") actual["SSEDescription"].should.have.key("Status").equals("ENABLED")
actual["SSEDescription"].should.have.key("SSEType").equals("KMS") actual["SSEDescription"].should.have.key("SSEType").equals("KMS")
actual["SSEDescription"].should.have.key("KMSMasterKeyArn").equals("custom-kms-key") actual["SSEDescription"].should.have.key("KMSMasterKeyArn").equals("custom-kms-key")
@mock_dynamodb
def test_create_table__specify_non_key_column():
client = boto3.client("dynamodb", "us-east-2")
client.create_table(
TableName="tab",
KeySchema=[
{"AttributeName": "PK", "KeyType": "HASH"},
{"AttributeName": "SomeColumn", "KeyType": "N"},
],
BillingMode="PAY_PER_REQUEST",
AttributeDefinitions=[
{"AttributeName": "PK", "AttributeType": "S"},
{"AttributeName": "SomeColumn", "AttributeType": "N"},
],
)
actual = client.describe_table(TableName="tab")["Table"]
actual["KeySchema"].should.equal(
[
{"AttributeName": "PK", "KeyType": "HASH"},
{"AttributeName": "SomeColumn", "KeyType": "N"},
]
)
if not settings.TEST_SERVER_MODE:
ddb = dynamodb_backends[ACCOUNT_ID]["us-east-2"]
ddb.tables["tab"].attr.should.contain(
{"AttributeName": "PK", "AttributeType": "S"}
)
ddb.tables["tab"].attr.should.contain(
{"AttributeName": "SomeColumn", "AttributeType": "N"}
)
# It should recognize PK is the Hash Key
ddb.tables["tab"].hash_key_attr.should.equal("PK")
# It should recognize that SomeColumn is not a Range Key
ddb.tables["tab"].has_range_key.should.equal(False)
ddb.tables["tab"].range_key_names.should.equal([])