change result

bymoye · bymoye · commit 20247b5a57e7 · 2025-07-01T12:57:02.000+08:00
diff --git a/docs/components/results.md b/docs/components/results.md
@@ -14,8 +14,9 @@ Currently there are two results:
 ### Result
 
 #### Parameters
+
 - `custom_decoders`: custom decoders for unsupported types. [Read more](/usage/types/advanced_type_usage.md)
-- `as_tuple`: return result as a tuple instead of dict.
+- `as_tuple`: Headless tuple output
 
 Get the result as a list of dicts
 
@@ -32,14 +33,15 @@ async def main() -> None:
     list_dict_result: List[Dict[str, Any]] = query_result.result()
 
     # Result as tuple
-    list_tuple_result: List[Tuple[Tuple[str, typing.Any], ...]] = query_result.result(
+    list_tuple_result: List[Tuple[str, typing.Any], ...] = query_result.result(
         as_tuple=True,
     )
 ```
 
 ### As class
 
 #### Parameters
+
 - `as_class`: Custom class from Python.
 - `custom_decoders`: custom decoders for unsupported types. [Read more](/usage/types/advanced_type_usage.md)
 
@@ -68,6 +70,7 @@ async def main() -> None:
 ### Row Factory
 
 #### Parameters
+
 - `row_factory`: custom callable object.
 - `custom_decoders`: custom decoders for unsupported types. [Read more](/usage/types/advanced_type_usage.md)
 
@@ -78,8 +81,9 @@ async def main() -> None:
 ### Result
 
 #### Parameters
+
 - `custom_decoders`: custom decoders for unsupported types. [Read more](/usage/types/advanced_type_usage.md)
-- `as_tuple`: return result as a tuple instead of dict.
+- `as_tuple`: Headless tuple output
 
 Get the result as a dict
 
@@ -96,14 +100,15 @@ async def main() -> None:
     dict_result: Dict[str, Any] = query_result.result()
 
     # Result as tuple
-    tuple_result: Tuple[Tuple[str, typing.Any], ...] = query_result.result(
+    tuple_result: Tuple[str, typing.Any] = query_result.result(
         as_tuple=True,
     )
 ```
 
 ### As class
 
 #### Parameters
+
 - `as_class`: Custom class from Python.
 - `custom_decoders`: custom decoders for unsupported types. [Read more](/usage/types/advanced_type_usage.md)
 
@@ -131,6 +136,7 @@ async def main() -> None:
 ### Row Factory
 
 #### Parameters
+
 - `row_factory`: custom callable object.
 - `custom_decoders`: custom decoders for unsupported types. [Read more](/usage/types/advanced_type_usage.md)
 
diff --git a/python/tests/test_query_results.py b/python/tests/test_query_results.py
@@ -39,7 +39,7 @@ async def test_result_as_tuple(
 
     assert isinstance(conn_result, QueryResult)
     assert isinstance(single_tuple_row, tuple)
-    assert single_tuple_row[0][0] == "id"
+    assert single_tuple_row[0] == 1
 
 
 async def test_single_result_as_dict(
@@ -73,4 +73,4 @@ async def test_single_result_as_tuple(
 
     assert isinstance(conn_result, SingleQueryResult)
     assert isinstance(result_tuple, tuple)
-    assert result_tuple[0][0] == "id"
+    assert result_tuple[0] == 1
diff --git a/python/tests/test_value_converter.py b/python/tests/test_value_converter.py
@@ -672,7 +672,7 @@ def point_encoder(point_bytes: bytes) -> str:  # noqa: ARG001
             as_tuple=True,
         )
 
-        assert result[0][0][1] == "Just An Example"
+        assert result[0][0] == "Just An Example"
 
 
 async def test_row_factory_query_result(
diff --git a/src/query_result.rs b/src/query_result.rs
@@ -42,14 +42,15 @@ fn row_to_tuple<'a>(
     postgres_row: &'a Row,
     custom_decoders: &Option<Py<PyDict>>,
 ) -> PSQLPyResult<Bound<'a, PyTuple>> {
-    let mut rows: Vec<Bound<'_, PyTuple>> = vec![];
+    let columns = postgres_row.columns();
+    let mut tuple_items = Vec::with_capacity(columns.len());
 
-    for (column_idx, column) in postgres_row.columns().iter().enumerate() {
-        let python_type = postgres_to_py(py, postgres_row, column, column_idx, custom_decoders)?;
-        let timed_tuple = PyTuple::new(py, vec![column.name().into_py_any(py)?, python_type])?;
-        rows.push(timed_tuple);
+    for (column_idx, column) in columns.iter().enumerate() {
+        let python_value = postgres_to_py(py, postgres_row, column, column_idx, custom_decoders)?;
+        tuple_items.push(python_value);
     }
-    Ok(PyTuple::new(py, rows)?)
+
+    Ok(PyTuple::new(py, tuple_items)?)
 }
 
 #[pyclass(name = "QueryResult")]
diff --git a/src/value_converter/to_python.rs b/src/value_converter/to_python.rs
@@ -604,7 +604,7 @@ pub fn raw_bytes_data_process(
 
         if let Ok(Some(py_encoder_func)) = py_encoder_func {
             return Ok(py_encoder_func
-                .call((raw_bytes_data.to_vec(),), None)?
+                .call1((PyBytes::new(py, raw_bytes_data),))?
                 .unbind());
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -672,7 +672,7 @@ def point_encoder(point_bytes: bytes) -> str: # noqa: ARG001`
`672`	`672`	`as_tuple=True,`
`673`	`673`	`)`
`674`	`674`
`675`		`- assert result[0][0][1] == "Just An Example"`
	`675`	`+ assert result[0][0] == "Just An Example"`
`676`	`676`
`677`	`677`
`678`	`678`	`async def test_row_factory_query_result(`
Original file line number	Diff line number	Diff line change
`@@ -604,7 +604,7 @@ pub fn raw_bytes_data_process(`
`604`	`604`
`605`	`605`	`if let Ok(Some(py_encoder_func)) = py_encoder_func {`
`606`	`606`	`return Ok(py_encoder_func`
`607`		`- .call((raw_bytes_data.to_vec(),), None)?`
	`607`	`+ .call1((PyBytes::new(py, raw_bytes_data),))?`
`608`	`608`	`.unbind());`
`609`	`609`	`}`
`610`	`610`	`}`