more work

Author: adev-code

botocore/model.py

@@ -121,6 +121,7 @@ def __init__(self, shape_name, shape_model, shape_resolver=None):
         """
         self.name = shape_name
         self.type_name = shape_model['type']
+        self.boxed = shape_model.get('box', False)
         self.documentation = shape_model.get('documentation', '')
         self._shape_model = shape_model
         if shape_resolver is None:

botocore/parsers.py

@@ -194,6 +194,15 @@ class ResponseParserError(Exception):
     pass
 
 
+def box_decorator(func):
+    def handle_box(self, shape, value):
+        if shape.boxed and value is None:
+            return None
+        return func(self, shape, value)
+
+    return handle_box
+
+
 class ResponseParser:
     """Base class for response parsing.
 
@@ -340,10 +349,18 @@ def _do_modeled_error_parse(self, response, shape, parsed):
             f"{self.__class__.__name__}._do_modeled_error_parse"
         )
 
+    BOXABLE_PRIMITIVE_TYPES = ["long", "integer", "boolean"]
+
     def _parse_shape(self, shape, node):
         handler = getattr(
             self, f'_handle_{shape.type_name}', self._default_handle
         )
+        if (
+            shape.type_name in self.BOXABLE_PRIMITIVE_TYPES
+            and shape.boxed
+            and node is None
+        ):
+            return None
         return handler(shape, node)
 
     def _handle_list(self, shape, node):
@@ -1331,10 +1348,7 @@ def _handle_boolean(self, shape, value):
         return ensure_boolean(value)
 
     def _handle_integer(self, shape, value):
-        if value is None:
-            return None
-        else:
-            return int(value)
+        return int(value)
 
     def _handle_float(self, shape, value):
         return float(value)

main_botocore.py

@@ -0,0 +1,38 @@
+import boto3
+
+boto3.set_stream_logger('')
+
+
+rds_client = boto3.client('rds-data')
+
+sql = '''
+select array[123::int4, null::int4, 456::int4];
+'''
+
+recs = rds_client.execute_statement(
+    secretArn='arn:aws:secretsmanager:us-east-1:135633386280:secret:rds!cluster-9237ce19-931d-48a6-9130-c1f7e4930a27-ZLZKOT',
+    resourceArn='arn:aws:rds:us-east-1:135633386280:cluster:data-api-test',
+    database='postgres',
+    sql=sql,
+)
+
+print(f'{recs}')
+
+
+# TODO: Working below for comparison
+
+# import boto3
+# boto3.set_stream_logger('')
+#
+# rds_client = boto3.client('rds-data')
+#
+# sql = 'select array[123::int4, 789::int4, 456::int4];'
+#
+# recs = rds_client.execute_statement(
+#     secretArn = 'arn:aws:secretsmanager:us-east-1:135633386280:secret:rds!cluster-9237ce19-931d-48a6-9130-c1f7e4930a27-ZLZKOT',
+#     resourceArn = 'arn:aws:rds:us-east-1:135633386280:cluster:data-api-test',
+#     database = 'postgres',
+#     sql = sql
+# )
+#
+# print(f'{recs}')