Adding tests for multi-dimensional arrays

Signed-off-by: chandr-andr (Kiselev Aleksandr) <[email protected]>

Author: chandr-andr

python/psqlpy/_internal/extra_types.pyi

@@ -113,6 +113,7 @@ class PyJSON:
         value: typing.Union[
             dict[str, typing.Any],
             list[dict[str, typing.Any]],
+            list[typing.Any],
         ],
     ) -> None:
         """Create new instance of PyJSON.

python/tests/test_value_converter.py

@@ -11,7 +11,7 @@
 from typing_extensions import Annotated
 
 from psqlpy import ConnectionPool
-from psqlpy._internal.extra_types import PyCustomType
+from psqlpy.exceptions import PyToRustValueMappingError
 from psqlpy.extra_types import (
     BigInt,
     Float32,
@@ -20,6 +20,7 @@
     Money,
     PyBox,
     PyCircle,
+    PyCustomType,
     PyJSON,
     PyJSONB,
     PyLine,
@@ -385,6 +386,41 @@ async def test_as_class(
                 },
             ],
         ),
+        (
+            "JSON ARRAY",
+            [
+                [
+                    PyJSON(
+                        {
+                            "test": ["something", 123, "here"],
+                            "nested": ["JSON"],
+                        },
+                    ),
+                ],
+                [
+                    PyJSON(
+                        {
+                            "test": ["something", 123, "here"],
+                            "nested": ["JSON"],
+                        },
+                    ),
+                ],
+            ],
+            [
+                [
+                    {
+                        "test": ["something", 123, "here"],
+                        "nested": ["JSON"],
+                    },
+                ],
+                [
+                    {
+                        "test": ["something", 123, "here"],
+                        "nested": ["JSON"],
+                    },
+                ],
+            ],
+        ),
         (
             "JSON ARRAY",
             [
@@ -396,6 +432,17 @@ async def test_as_class(
                 [{"array": "json"}, {"one more": "test"}],
             ],
         ),
+        (
+            "JSON ARRAY",
+            [
+                PyJSON([[{"array": "json"}], [{"one more": "test"}]]),
+                PyJSON([[{"array": "json"}], [{"one more": "test"}]]),
+            ],
+            [
+                [[{"array": "json"}], [{"one more": "test"}]],
+                [[{"array": "json"}], [{"one more": "test"}]],
+            ],
+        ),
         (
             "POINT ARRAY",
             [
@@ -407,6 +454,17 @@ async def test_as_class(
                 (2.0, 3.0),
             ],
         ),
+        (
+            "POINT ARRAY",
+            [
+                [PyPoint([1.5, 2])],
+                [PyPoint([2, 3])],
+            ],
+            [
+                [(1.5, 2.0)],
+                [(2.0, 3.0)],
+            ],
+        ),
         (
             "BOX ARRAY",
             [
@@ -418,6 +476,17 @@ async def test_as_class(
                 ((9.0, 9.0), (8.5, 8.0)),
             ],
         ),
+        (
+            "BOX ARRAY",
+            [
+                [PyBox([3.5, 3, 9, 9])],
+                [PyBox([8.5, 8, 9, 9])],
+            ],
+            [
+                [((9.0, 9.0), (3.5, 3.0))],
+                [((9.0, 9.0), (8.5, 8.0))],
+            ],
+        ),
         (
             "PATH ARRAY",
             [
@@ -429,6 +498,17 @@ async def test_as_class(
                 ((3.5, 3.0), (6.0, 6.0), (3.5, 3.0)),
             ],
         ),
+        (
+            "PATH ARRAY",
+            [
+                [PyPath([(3.5, 3), (9, 9), (8, 8)])],
+                [PyPath([(3.5, 3), (6, 6), (3.5, 3)])],
+            ],
+            [
+                [[(3.5, 3.0), (9.0, 9.0), (8.0, 8.0)]],
+                [((3.5, 3.0), (6.0, 6.0), (3.5, 3.0))],
+            ],
+        ),
         (
             "LINE ARRAY",
             [
@@ -440,6 +520,17 @@ async def test_as_class(
                 (1.0, -2.0, 3.0),
             ],
         ),
+        (
+            "LINE ARRAY",
+            [
+                [PyLine([-2, 1, 2])],
+                [PyLine([1, -2, 3])],
+            ],
+            [
+                [(-2.0, 1.0, 2.0)],
+                [(1.0, -2.0, 3.0)],
+            ],
+        ),
         (
             "LSEG ARRAY",
             [
@@ -451,6 +542,17 @@ async def test_as_class(
                 [(5.6, 3.1), (4.0, 5.0)],
             ],
         ),
+        (
+            "LSEG ARRAY",
+            [
+                [PyLineSegment({(1, 2), (9, 9)})],
+                [PyLineSegment([(5.6, 3.1), (4, 5)])],
+            ],
+            [
+                [[(1.0, 2.0), (9.0, 9.0)]],
+                [[(5.6, 3.1), (4.0, 5.0)]],
+            ],
+        ),
         (
             "CIRCLE ARRAY",
             [
@@ -462,6 +564,17 @@ async def test_as_class(
                 ((5.0, 1.8), 10.0),
             ],
         ),
+        (
+            "CIRCLE ARRAY",
+            [
+                [PyCircle([1.7, 2.8, 3])],
+                [PyCircle([5, 1.8, 10])],
+            ],
+            [
+                [((1.7, 2.8), 3.0)],
+                [((5.0, 1.8), 10.0)],
+            ],
+        ),
     ),
 )
 async def test_deserialization_simple_into_python(
@@ -529,6 +642,7 @@ async def test_deserialization_composite_into_python(
         circle_ CIRCLE,
 
         varchar_arr VARCHAR ARRAY,
+        varchar_arr_mdim VARCHAR ARRAY,
         text_arr TEXT ARRAY,
         bool_arr BOOL ARRAY,
         int2_arr INT2 ARRAY,
@@ -569,9 +683,9 @@ class TestEnum(Enum):
         SAD = "sad"
         HAPPY = "happy"
 
-    row_values = ", ".join([f"${index}" for index in range(1, 40)])
-    row_values += ", ROW($40, $41), "
-    row_values += ", ".join([f"${index}" for index in range(42, 49)])
+    row_values = ", ".join([f"${index}" for index in range(1, 41)])
+    row_values += ", ROW($41, $42), "
+    row_values += ", ".join([f"${index}" for index in range(43, 50)])
 
     await psql_pool.execute(
         querystring=f"INSERT INTO for_test VALUES (ROW({row_values}))",
@@ -609,6 +723,7 @@ class TestEnum(Enum):
             PyLineSegment(((1.7, 2.8), (9, 9))),
             PyCircle([1.7, 2.8, 3]),
             ["Some String", "Some String"],
+            [["Some String"], ["Some String"]],
             [PyText("Some String"), PyText("Some String")],
             [True, False],
             [SmallInt(123), SmallInt(321)],
@@ -706,6 +821,7 @@ class ValidateModelForCustomType(BaseModel):
         circle_: Tuple[Tuple[float, float], float]
 
         varchar_arr: List[str]
+        varchar_arr_mdim: List[List[str]]
         text_arr: List[str]
         bool_arr: List[bool]
         int2_arr: List[int]
@@ -867,3 +983,21 @@ def row_factory(db_result: Dict[str, Any]) -> List[str]:
     assert len(as_row_factory) == expected_number_of_elements_in_result
 
     assert isinstance(as_row_factory, list)
+
+
+async def test_incorrect_dimensions_array(
+    psql_pool: ConnectionPool,
+) -> None:
+    await psql_pool.execute("DROP TABLE IF EXISTS test_marr")
+    await psql_pool.execute("CREATE TABLE test_marr (var_array VARCHAR ARRAY)")
+
+    with pytest.raises(expected_exception=PyToRustValueMappingError):
+        await psql_pool.execute(
+            querystring="INSERT INTO test_marr VALUES ($1)",
+            parameters=[
+                [
+                    ["Len", "is", "Three"],
+                    ["Len", "is", "Four", "Wow"],
+                ],
+            ],
+        )