Remove polygon usage and fix some errors

Author: AGAEV Denis E

python/psqlpy/_internal/extra_types.pyi

@@ -230,22 +230,6 @@ class PyLineSegment:
         - `value`: any valid structure with int/float numbers in every combination.
         """
 
-class PyPolygon:
-    """Represent polygon field in PostgreSQL and Polygon in Rust."""
-
-    def __init__(self: Self, value: PairsOfCoordinates) -> None:
-        """Create new instance of PyPolygon.
-
-        You need to pass any of this structures:
-        - sequence(List, Tuple or Set) of sequences(List, Tuple or Set),
-            each with pair of int/float numbers in every combination
-        - sequence(List, Tuple or Set) with pairs
-            of int/float numbers in every combination
-
-        ### Parameters:
-        - `value`: any valid structure with int/float numbers in every combination.
-        """
-
 class PyCircle:
     """Represent line field in PostgreSQL and Line in Rust."""
 

python/psqlpy/extra_types.py

@@ -15,7 +15,6 @@
     PyMacAddr8,
     PyPath,
     PyPoint,
-    PyPolygon,
     PyText,
     PyVarChar,
     SmallInt,
@@ -40,6 +39,5 @@
     "PyPath",
     "PyLine",
     "PyLineSegment",
-    "PyPolygon",
     "PyCircle",
 ]

python/tests/test_value_converter.py

@@ -3,7 +3,7 @@
 from decimal import Decimal
 from enum import Enum
 from ipaddress import IPv4Address
-from typing import Annotated, Any, Dict, List, Union
+from typing import Annotated, Any, Dict, List, Tuple, Union
 
 import pytest
 from pydantic import BaseModel
@@ -27,7 +27,6 @@
     PyMacAddr8,
     PyPath,
     PyPoint,
-    PyPolygon,
     PyText,
     SmallInt,
 )
@@ -164,16 +163,6 @@ async def test_as_class(
         ("LINE", PyLine([1, -2, 3]), (1.0, -2.0, 3.0)),
         ("LSEG", PyLineSegment({(1, 2), (9, 9)}), [(1.0, 2.0), (9.0, 9.0)]),
         ("LSEG", PyLineSegment(((1.7, 2.8), (9, 9))), [(1.7, 2.8), (9.0, 9.0)]),
-        (
-            "POLYGON",
-            PyPolygon((1.7, 2.8, 3.3, 2.5, 9, 9, 8, 8, 1.7, 2.8)),
-            ((1.7, 2.8), (3.3, 2.5), (9.0, 9.0), (8.0, 8.0), (1.7, 2.8)),
-        ),
-        (
-            "POLYGON",
-            PyPolygon(((1.7, 2.8), (3.3, 2.5), (9, 9), (8, 8), (1.7, 2.8))),
-            ((1.7, 2.8), (3.3, 2.5), (9.0, 9.0), (8.0, 8.0), (1.7, 2.8)),
-        ),
         (
             "CIRCLE",
             PyCircle((1.7, 2.8, 3)),
@@ -370,17 +359,6 @@ async def test_as_class(
                 [(5.6, 3.1), (4.0, 5.0)],
             ],
         ),
-        (
-            "POLYGON ARRAY",
-            [
-                PyPolygon(((1.7, 2.8), (3.3, 2.5), (9, 9), (1.7, 2.8))),
-                PyPolygon([{-1.0, 0.5}, {-0.3, 0.3}, {0.3, 0.7}, {0.6, -0.6}]),
-            ],
-            [
-                ((1.7, 2.8), (3.3, 2.5), (9.0, 9.0), (1.7, 2.8)),
-                ((-1.0, 0.5), (-0.3, 0.3), (0.3, 0.7), (0.6, -0.6)),
-            ],
-        ),
         (
             "CIRCLE ARRAY",
             [
@@ -456,7 +434,6 @@ async def test_deserialization_composite_into_python(
         path_ PATH,
         line_ LINE,
         lseg_ LSEG,
-        polygon_ POLYGON,
         circle_ CIRCLE,
 
         varchar_arr VARCHAR ARRAY,
@@ -481,7 +458,6 @@ async def test_deserialization_composite_into_python(
         path_arr PATH ARRAY,
         line_arr LINE ARRAY,
         lseg_arr LSEG ARRAY,
-        polygon_arr POLYGON ARRAY,
         circle_arr CIRCLE ARRAY
     )
     """
@@ -501,9 +477,9 @@ class TestEnum(Enum):
         SAD = "sad"
         HAPPY = "happy"
 
-    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, 51)])
+    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)])
 
     await psql_pool.execute(
         querystring=f"INSERT INTO for_test VALUES (ROW({row_values}))",
@@ -539,7 +515,6 @@ class TestEnum(Enum):
             PyPath(((1.7, 2.8), (3.3, 2.5), (9, 9), (1.7, 2.8))),
             PyLine({-2, 1, 2}),
             PyLineSegment(((1.7, 2.8), (9, 9))),
-            PyPolygon(((1.7, 2.8), (3.3, 2.5), (9, 9), (1.7, 2.8))),
             PyCircle([1.7, 2.8, 3]),
             ["Some String", "Some String"],
             [PyText("Some String"), PyText("Some String")],
@@ -601,10 +576,6 @@ class TestEnum(Enum):
                 PyLineSegment({(1, 2), (9, 9)}),
                 PyLineSegment([(5.6, 3.1), (4, 5)]),
             ],
-            [
-                PyPolygon(((1.7, 2.8), (3.3, 2.5), (9, 9), (1.7, 2.8))),
-                PyPolygon([{-1.0, 0.5}, {-0.3, 0.3}, {0.3, 0.7}, {0.6, -0.6}]),
-            ],
             [
                 PyCircle([1.7, 2.8, 3]),
                 PyCircle([5, 1.8, 10]),
@@ -635,13 +606,12 @@ class ValidateModelForCustomType(BaseModel):
         inet_: IPv4Address
         jsonb_: Dict[str, List[Union[str, int, List[str]]]]
         json_: Dict[str, List[Union[str, int, List[str]]]]
-        point_: tuple[float, float]
-        box_: tuple[tuple[float, float], tuple[float, float]]
-        path_: list[tuple[float, float]]
+        point_: Tuple[float, float]
+        box_: Tuple[Tuple[float, float], Tuple[float, float]]
+        path_: List[Tuple[float, float]]
         line_: Annotated[list[float], 3]
-        lseg_: Annotated[list[tuple[float, float]], 2]
-        polygon_: tuple[tuple[float, float], ...]
-        circle_: tuple[float, float, float]
+        lseg_: Annotated[list[Tuple[float, float]], 2]
+        circle_: Tuple[Tuple[float, float], float]
 
         varchar_arr: List[str]
         text_arr: List[str]
@@ -658,13 +628,12 @@ class ValidateModelForCustomType(BaseModel):
         inet_arr: List[IPv4Address]
         jsonb_arr: List[Dict[str, List[Union[str, int, List[str]]]]]
         json_arr: List[Dict[str, List[Union[str, int, List[str]]]]]
-        point_arr: list[tuple[float, float]]
-        box_arr: list[tuple[tuple[float, float], tuple[float, float]]]
-        path_arr: list[list[tuple[float, float]]]
-        line_arr: list[Annotated[list[float], 3]]
-        lseg_arr: list[Annotated[list[tuple[float, float]], 2]]
-        polygon_arr: list[tuple[tuple[float, float], ...]]
-        circle_arr: list[tuple[float, float, float]]
+        point_arr: List[Tuple[float, float]]
+        box_arr: List[Tuple[Tuple[float, float], Tuple[float, float]]]
+        path_arr: List[list[Tuple[float, float]]]
+        line_arr: List[Annotated[List[float], 3]]
+        lseg_arr: List[Annotated[List[Tuple[float, float]], 2]]
+        circle_arr: List[Tuple[Tuple[float, float], float]]
 
         test_inner_value: ValidateModelForInnerValueType
         test_enum_type: TestEnum

src/additional_types.rs

@@ -2,10 +2,7 @@ use std::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Sub, SubAssign};
 
 use byteorder::{BigEndian, ReadBytesExt};
 use bytes::{BufMut, BytesMut};
-use geo_types::{
-    coord, Coord, CoordFloat, CoordNum, Line as LineSegment, LineString, Point, Polygon, Rect,
-};
-use itertools::Itertools;
+use geo_types::{coord, Coord, CoordFloat, CoordNum, Line as LineSegment, LineString, Point, Rect};
 use macaddr::{MacAddr6, MacAddr8};
 use postgres_protocol::types;
 use postgres_types::{to_sql_checked, IsNull, ToSql};
@@ -79,7 +76,6 @@ build_additional_rust_type!(RustPoint, Point);
 build_additional_rust_type!(RustRect, Rect);
 build_additional_rust_type!(RustLineString, LineString);
 build_additional_rust_type!(RustLineSegment, LineSegment);
-build_additional_rust_type!(RustPolygon, Polygon);
 
 impl<'a> IntoPy<PyObject> for &'a RustPoint {
     #[inline]
@@ -296,76 +292,6 @@ impl<'a> FromSql<'a> for RustLineSegment {
     }
 }
 
-impl<'a> IntoPy<PyObject> for &'a RustPolygon {
-    #[inline]
-    fn into_py(self, py: Python<'_>) -> PyObject {
-        let inner_value = self.inner();
-
-        let mut result_vec: Vec<Py<PyAny>> = vec![];
-        for coordinate in inner_value.exterior() {
-            result_vec.push(
-                PyTuple::new_bound(py, vec![coordinate.x.into_py(py), coordinate.y.into_py(py)])
-                    .into(),
-            );
-        }
-
-        return PyTuple::new_bound(py, result_vec).into();
-    }
-}
-
-impl ToSql for RustPolygon {
-    fn to_sql(
-        &self,
-        _: &Type,
-        out: &mut BytesMut,
-    ) -> Result<IsNull, Box<dyn std::error::Error + Sync + Send>> {
-        for coord in &self.inner().exterior().0 {
-            let coordinates_pair = format!("{} {}", coord.x, coord.y);
-            let coordinates_bytes_repr = coordinates_pair.as_bytes();
-            out.extend_from_slice(coordinates_bytes_repr);
-        }
-
-        Ok(IsNull::No)
-    }
-
-    to_sql_checked!();
-
-    fn accepts(_ty: &Type) -> bool {
-        true
-    }
-}
-
-impl<'a> FromSql<'a> for RustPolygon {
-    fn from_sql(
-        _ty: &Type,
-        raw: &'a [u8],
-    ) -> Result<Self, Box<dyn std::error::Error + Sync + Send>> {
-        let mut vec_raw = vec![];
-        vec_raw.extend_from_slice(raw);
-        let mut buf = vec_raw.as_slice();
-
-        let mut vec_raw_coord = vec![];
-        buf.read_f64_into::<BigEndian>(&mut vec_raw_coord)?;
-
-        let mut vec_coord = vec![];
-        for (x1, y1) in vec_raw_coord.into_iter().tuples() {
-            vec_coord.push(coord!(x: x1, y: y1));
-        }
-
-        if !buf.is_empty() {
-            return Err("Cannot convert PostgreSQL POLYGON into rust Polygon".into());
-        }
-
-        let polygon_exterior = LineString::from(vec_coord);
-        let new_polygon = Polygon::new(polygon_exterior, vec![]);
-        Ok(RustPolygon::new(new_polygon))
-    }
-
-    fn accepts(_ty: &Type) -> bool {
-        true
-    }
-}
-
 #[derive(Eq, PartialEq, Clone, Copy, Debug, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub struct Line<T: CoordNum = f64> {

src/driver/connection_pool.rs

@@ -304,6 +304,11 @@ impl ConnectionPool {
                                 .collect::<Vec<&QueryParameter>>(),
                         )
                         .await
+                        .map_err(|err| {
+                            RustPSQLDriverError::ConnectionExecuteError(format!(
+                                "Cannot execute statement from ConnectionPool, error - {err}"
+                            ))
+                        })
                 })
                 .await??
         } else {

src/extra_types.rs

@@ -1,6 +1,6 @@
 use std::str::FromStr;
 
-use geo_types::{Line as LineSegment, LineString, Point, Polygon, Rect};
+use geo_types::{Line as LineSegment, LineString, Point, Rect};
 use macaddr::{MacAddr6, MacAddr8};
 use pyo3::{
     pyclass, pymethods,
@@ -211,7 +211,6 @@ build_geo_type!(PyBox, Rect);
 build_geo_type!(PyPath, LineString);
 build_geo_type!(PyLine, Line);
 build_geo_type!(PyLineSegment, LineSegment);
-build_geo_type!(PyPolygon, Polygon);
 build_geo_type!(PyCircle, Circle);
 
 #[pymethods]
@@ -279,19 +278,6 @@ impl PyLineSegment {
     }
 }
 
-#[pymethods]
-impl PyPolygon {
-    #[new]
-    #[allow(clippy::missing_errors_doc)]
-    pub fn new_polygon(value: Py<PyAny>) -> RustPSQLDriverPyResult<Self> {
-        let polygon_coords = build_geo_coords(value, None)?;
-
-        Ok(Self {
-            inner: Polygon::new(LineString::from(polygon_coords), vec![]),
-        })
-    }
-}
-
 #[pymethods]
 impl PyCircle {
     #[new]
@@ -325,7 +311,6 @@ pub fn extra_types_module(_py: Python<'_>, pymod: &Bound<'_, PyModule>) -> PyRes
     pymod.add_class::<PyPath>()?;
     pymod.add_class::<PyLine>()?;
     pymod.add_class::<PyLineSegment>()?;
-    pymod.add_class::<PyPolygon>()?;
     pymod.add_class::<PyCircle>()?;
     Ok(())
 }