Moved additional_types to value_converter

Author: chandr-andr

src/extra_types.rs

@@ -10,9 +10,9 @@ use pyo3::{
 use serde_json::Value;
 
 use crate::{
-    additional_types::{Circle as RustCircle, Line as RustLine},
     exceptions::rust_errors::{RustPSQLDriverError, RustPSQLDriverPyResult},
     value_converter::{
+        additional_types::{Circle as RustCircle, Line as RustLine},
         funcs::from_python::{
             build_flat_geo_coords, build_geo_coords, py_sequence_into_postgres_array,
         },

src/lib.rs

@@ -1,4 +1,3 @@
-pub mod additional_types;
 pub mod common;
 pub mod driver;
 pub mod exceptions;

src/additional_types.rs renamed to src/value_converter/additional_types.rs

@@ -4,34 +4,25 @@ use geo_types::{coord, Coord};
 use itertools::Itertools;
 use pg_interval::Interval;
 use postgres_array::{Array, Dimension};
-use postgres_types::{Field, FromSql, Kind, Type};
 use rust_decimal::Decimal;
 use serde_json::{json, Map, Value};
 use std::net::IpAddr;
-use tokio_postgres::{Column, Row};
 use uuid::Uuid;
 
 use pyo3::{
     types::{
         PyAnyMethods, PyBool, PyBytes, PyDate, PyDateTime, PyDelta, PyDict, PyDictMethods, PyFloat,
-        PyInt, PyList, PyListMethods, PyMapping, PySequence, PySet, PyString, PyTime, PyTuple,
-        PyTypeMethods,
+        PyInt, PyList, PyMapping, PySequence, PySet, PyString, PyTime, PyTuple, PyTypeMethods,
     },
-    Bound, FromPyObject, IntoPy, Py, PyAny, Python, ToPyObject,
+    Bound, FromPyObject, Py, PyAny, Python,
 };
 
 use crate::{
-    additional_types::{
-        Circle, Line, RustLineSegment, RustLineString, RustMacAddr6, RustMacAddr8, RustPoint,
-        RustRect,
-    },
     exceptions::rust_errors::{RustPSQLDriverError, RustPSQLDriverPyResult},
     extra_types::{self},
     value_converter::{consts::KWARGS_QUERYSTRINGS, models::dto::PythonDTO},
 };
 
-use pgvector::Vector as PgVector;
-
 /// Convert single python parameter to `PythonDTO` enum.
 ///
 /// # Errors

src/value_converter/funcs/from_python.rs

@@ -1,5 +1,4 @@
-use chrono::{self, DateTime, FixedOffset, NaiveDate, NaiveDateTime, NaiveTime, TimeZone};
-use chrono_tz::Tz;
+use chrono::{self, DateTime, FixedOffset, NaiveDate, NaiveDateTime, NaiveTime};
 use pg_interval::Interval;
 use postgres_array::{Array, Dimension};
 use postgres_types::{Field, FromSql, Kind, Type};
@@ -14,16 +13,16 @@ use pyo3::{
         PyAnyMethods, PyBytes, PyDict, PyDictMethods, PyList, PyListMethods, PySet, PyString,
         PyTuple,
     },
-    Bound, FromPyObject, IntoPy, Py, PyAny, Python, ToPyObject,
+    Bound, IntoPy, Py, PyAny, Python, ToPyObject,
 };
 
 use crate::{
-    additional_types::{
-        Circle, Line, RustLineSegment, RustLineString, RustMacAddr6, RustMacAddr8, RustPoint,
-        RustRect,
-    },
     exceptions::rust_errors::{RustPSQLDriverError, RustPSQLDriverPyResult},
     value_converter::{
+        additional_types::{
+            Circle, Line, RustLineSegment, RustLineString, RustMacAddr6, RustMacAddr8, RustPoint,
+            RustRect,
+        },
         consts::KWARGS_QUERYSTRINGS,
         models::{
             decimal::InnerDecimal, interval::InnerInterval, serde_value::InternalSerdeValue,

src/value_converter/funcs/to_python.rs

@@ -1,3 +1,4 @@
+pub mod additional_types;
 pub mod consts;
 pub mod funcs;
 pub mod models;

src/value_converter/mod.rs

@@ -14,8 +14,10 @@ use pyo3::{PyObject, Python, ToPyObject};
 use tokio_postgres::types::{to_sql_checked, Type};
 
 use crate::{
-    additional_types::{Circle, Line, RustLineSegment, RustLineString, RustPoint, RustRect},
     exceptions::rust_errors::{RustPSQLDriverError, RustPSQLDriverPyResult},
+    value_converter::additional_types::{
+        Circle, Line, RustLineSegment, RustLineString, RustPoint, RustRect,
+    },
 };
 use pgvector::Vector as PgVector;
 use postgres_array::{array::Array, Dimension};