[DynamoDB bugFix] Fix Key Expression building for renamable sort keys#4357
Merged
muhammad-othman merged 2 commits intoaws:developmentfrom Mar 23, 2026
Merged
Conversation
Use the actual attribute name from PropertyStorage when building range-key expressions to support renamable range/sort keys. Updated ContextInternal to pass the PropertyStorage and use its AttributeName in expression attribute name mappings, and adjusted the helper signature accordingly. Added a unit test (TestRenamableAttributeEntity + ConvertQueryConditional_WithRenamableHashAndRangeAttributes_ReturnsValidSearch) and a mock DescribeTableResponse for that entity to validate the fix.
irina-herciu
changed the title
Contributor
There was a problem hiding this comment.
Pull request overview
Fixes DynamoDBContext key-expression generation so range/sort key conditions use the actual DynamoDB attribute name (from PropertyStorage) instead of the CLR property name, enabling renamed sort keys to work correctly.
Changes:
- Update range-key expression mapping to use
rangeKeyProperty.AttributeNamewhen populatingExpressionAttributeNames. - Add a unit test covering renamed hash/range key attributes (
PK/SK) to validate the generated key expression. - Add a DynamoDBv2 patch dev config entry for release automation.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| sdk/src/Services/DynamoDBv2/Custom/DataModel/ContextInternal.cs | Fixes range-key expression attribute name mapping to use DynamoDB attribute names from model storage. |
| sdk/test/Services/DynamoDBv2/UnitTests/Custom/DataModel/ContextInternalTests.cs | Adds coverage for renamed hash/range key attributes to prevent regressions. |
| generator/.DevConfigs/1b37806c-0428-4c29-af36-ffb0fb271403.json | Declares a patch-level changelog entry for the DynamoDBv2 fix. |
You can also share your feedback on Copilot code review. Take the survey.
Member
|
Pending |
muhammad-othman
approved these changes
Mar 19, 2026
AlexDaines
approved these changes
Mar 19, 2026
| @@ -1918,14 +1918,13 @@ DocumentModel.Expression MapHashKeyExpression() | |||
| return keyExpression1; | |||
| } | |||
|
|
|||
| void MapRangeKeyConditionExpression( RangeKeyCondition rangeKeyCondition, int index, | |||
| string rangeKeyPropertyName, PropertyStorage rangeKeyProperty) | |||
| void MapRangeKeyConditionExpression(RangeKeyCondition rangeKeyCondition, int index,PropertyStorage rangeKeyProperty) | |||
Collaborator
There was a problem hiding this comment.
nit: whitespace issue on this line
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Use the actual attribute name from PropertyStorage when building range-key expressions to support renamable range/sort keys.
Description
Motivation and Context
Testing
Unit test added
Breaking Changes Assessment
Screenshots (if appropriate)
Types of changes
Checklist
License