Enhance Dict Resultset

Author: passren

pydynamodb/__init__.py

@@ -6,7 +6,7 @@
 if TYPE_CHECKING:
     from .connection import Connection
 
-__version__: str = "0.7.6"
+__version__: str = "0.8.0"
 
 # Globals https://www.python.org/dev/peps/pep-0249/#globals
 apilevel: str = "2.0"

pydynamodb/executor.py

@@ -309,27 +309,33 @@ def __init__(
             **kwargs,
         )
 
-    def process_rows(self, response: Dict[str, Any]) -> None:
-        rows = response.get("Items", None)
-        if rows is None:
-            raise DataError("KeyError `Items`")
-
-        processed_rows = list()
-        for row in rows:
-            row_ = self._process_row_item(row)
-            processed_rows.append(row_)
-
-        self._rows.extend(processed_rows)
-        self._next_token = response.get("NextToken", None)
-
-    def _process_row_item(self, row) -> Optional[Dict[str, Any]]:
+    def _process_undef_row_item(self, row) -> Optional[Dict[str, Any]]:
         row_ = dict()
         for col, val in row.items():
             val_ = self._converter.deserialize(val)
             row_[col] = val_
 
         return row_
 
+    def _process_predef_row_item(self, row) -> Optional[Dict[str, Any]]:
+        row_ = dict()
+        for col, val in row.items():
+            col_info = self.metadata.get(col, None)
+            if col_info:
+                if col_info.function:
+                    val_ = self._converter.deserialize(
+                        val,
+                        function=col_info.function.name,
+                        function_params=col_info.function.params,
+                    )
+                else:
+                    val_ = self._converter.deserialize(val)
+
+                col_name_ = col if col_info.alias is None else col_info.alias
+                row_[col_name_] = val_
+
+        return row_
+
 
 class DmlBatchExecutor(DmlStatementExecutor):
     def __init__(

tests/test_cursor_dml_dict_rs.py

@@ -59,6 +59,12 @@ def test_select(self, dict_cursor):
         )
         ret = dict_cursor.fetchall()
         assert len(ret) == 2
+        assert ret[1]["col_nested_map"] == {
+                "name": "test case 3",
+                "version": 1.0,
+                "list": ["Hello", "World", {1, 2, 3}, {"1", "2"}, 2],
+                "map": {"str": "Best", "num": 1, "chinese": "你好"},
+            }
 
         dict_cursor.execute(
             "SELECT col_ss, col_nested_list[4] FROM %s WHERE key_partition='row_1'"
@@ -68,3 +74,23 @@ def test_select(self, dict_cursor):
         assert len(ret) == 2
         assert ret[0] == {"col_ss": {"A", "B", "C"}}
         assert ret[1] == {"col_nested_list[4]": {1, 2, 3}}
+
+    def test_select_with_alias(self, dict_cursor):
+        dict_cursor.execute(
+            "SELECT col_ns a, col_nested_map.version b FROM %s WHERE key_partition='row_1'"
+            % TESTCASE05_TABLE
+        )
+        ret = dict_cursor.fetchall()
+        assert len(ret) == 2
+        assert ret[0] == {"a": {1, 2, 3.3, 4.0}}
+        assert ret[1] == {"b": 1.0}
+
+    def test_select_with_function(self, dict_cursor):
+        dict_cursor.execute(
+            "SELECT SUBSTR(col_str, 0, 4) str, UPPER(col_nested_map.name) name FROM %s WHERE key_partition='row_1'"
+            % TESTCASE05_TABLE
+        )
+        ret = dict_cursor.fetchall()
+        assert len(ret) == 2
+        assert ret[0] == {"str": "test"}
+        assert ret[1] == {"name": "TEST CASE 3"}