Merge pull request #3 from xoeye/fix_add_variables_to_expression

Allow snake_cased attributes in add_variables_to_expression

CHANGES.md

@@ -1,3 +1,8 @@
+### 1.3.3
+
+- Allow any characters for attribute names in `add_variables_to_expression`.
+  * We have a lot of snake_cased attribute names. We should be able to use this function with those.  
+
 ### 1.3.2
 
 - Addressed theoretical weakness in expression attribute naming by

tests/xoto3/dynamodb/utils/expressions_test.py

@@ -30,12 +30,18 @@ def test_add_variables_to_expression():
 
 
 def test_add_variables_to_expression_with_bad_attribute_name():
-    variables = {"thingy": "THINGY", "~deleted__At": "2020-02-02T00:00:00.000000Z"}
+    variables = {"thingy": "THINGY", "deleted__At": "2020-02-02T00:00:00.000000Z"}
+
+    query_dict = add_variables_to_expression(dict(), variables)
+    assert query_dict["ExpressionAttributeNames"] == {
+        "#thingy": "thingy",
+        "#deleted__At": "deleted__At",
+    }
+    assert query_dict["ExpressionAttributeValues"] == {
+        ":thingy": "THINGY",
+        ":deleted__At": "2020-02-02T00:00:00.000000Z",
+    }
 
-    with pytest.raises(
-        ValueError, match="Attribute name contains invalid characters: '~deleted__At'"
-    ):
-        add_variables_to_expression(dict(), variables)
 
 
 def test_add_variables_to_expression_with_duplicate_attribute_name():

xoto3/__about__.py

@@ -1,4 +1,4 @@
 """xoto3"""
-__version__ = "1.3.2"
+__version__ = "1.3.3"
 __author__ = "Peter Gaultney"
 __author_email__ = "[email protected]"

xoto3/dynamodb/utils/expressions.py

@@ -20,17 +20,11 @@ def make_unique_expr_attr_key(attr_name: str) -> str:
     return clean + "__xoto3__" + hashed.hexdigest()[:_HASH_LEN]
 
 
-def validate_attr_key(attr_name: str):
-    if _filter_alphanum(attr_name) != attr_name:
-        raise ValueError(f"Attribute name contains invalid characters: '{attr_name}'")
-
-
 def add_variables_to_expression(query_dict: dict, variables: dict) -> dict:
     """Attempt to make it easier to develop a query"""
     ea_names = query_dict.get("ExpressionAttributeNames", {})
     ea_values = query_dict.get("ExpressionAttributeValues", {})
     for k, v in variables.items():
-        validate_attr_key(k)
         name = f"#{k}"
         if name in ea_names:
             raise ValueError(