Skip to content

Commit 86b4d34

Browse files
committed
Continue implementing new realization. Fixed pyi files
Signed-off-by: chandr-andr (Kiselev Aleksandr) <chandr@chandr.net>
1 parent 1ea8bf7 commit 86b4d34

File tree

4 files changed

+13
-12
lines changed

4 files changed

+13
-12
lines changed

python/psqlpy/_internal/__init__.pyi

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ class Transaction:
536536
537537
```
538538
"""
539-
async def savepoint(self: Self, savepoint_name: str) -> None:
539+
async def create_savepoint(self: Self, savepoint_name: str) -> None:
540540
"""Create new savepoint.
541541
542542
One `savepoint_name` can be used once.
@@ -560,9 +560,9 @@ class Transaction:
560560
connection = await db_pool.connection()
561561
transaction = connection.transaction()
562562
563-
await transaction.savepoint("my_savepoint")
563+
await transaction.create_savepoint("my_savepoint")
564564
await transaction.execute(...)
565-
await transaction.rollback_to("my_savepoint")
565+
await transaction.rollback_savepoint("my_savepoint")
566566
```
567567
"""
568568
async def rollback(self: Self) -> None:
@@ -586,7 +586,7 @@ class Transaction:
586586
await transaction.rollback()
587587
```
588588
"""
589-
async def rollback_to(self: Self, savepoint_name: str) -> None:
589+
async def rollback_savepoint(self: Self, savepoint_name: str) -> None:
590590
"""ROLLBACK to the specified `savepoint_name`.
591591
592592
If you specified wrong savepoint name
@@ -609,7 +609,7 @@ class Transaction:
609609
610610
await transaction.savepoint("my_savepoint")
611611
await transaction.execute(...)
612-
await transaction.rollback_to("my_savepoint")
612+
await transaction.rollback_savepoint("my_savepoint")
613613
```
614614
"""
615615
async def release_savepoint(self: Self, savepoint_name: str) -> None:

python/tests/test_transaction.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ async def test_transaction_savepoint(
113113

114114
test_name = "test_name"
115115
savepoint_name = "sp1"
116-
await transaction.savepoint(savepoint_name=savepoint_name)
116+
await transaction.create_savepoint(savepoint_name=savepoint_name)
117117
await transaction.execute(
118118
f"INSERT INTO {table_name} VALUES ($1, $2)",
119119
parameters=[100, test_name],
@@ -124,7 +124,7 @@ async def test_transaction_savepoint(
124124
)
125125
assert result.result()
126126

127-
await transaction.rollback_to(savepoint_name=savepoint_name)
127+
await transaction.rollback_savepoint(savepoint_name=savepoint_name)
128128
result = await psql_pool.execute(
129129
f"SELECT * FROM {table_name} WHERE name = $1",
130130
parameters=[test_name],
@@ -182,15 +182,15 @@ async def test_transaction_release_savepoint(
182182
sp_name_1 = "sp1"
183183
sp_name_2 = "sp2"
184184

185-
await transaction.savepoint(sp_name_1)
185+
await transaction.create_savepoint(sp_name_1)
186186

187187
with pytest.raises(expected_exception=TransactionError):
188-
await transaction.savepoint(sp_name_1)
188+
await transaction.create_savepoint(sp_name_1)
189189

190-
await transaction.savepoint(sp_name_2)
190+
await transaction.create_savepoint(sp_name_2)
191191

192192
await transaction.release_savepoint(sp_name_1)
193-
await transaction.savepoint(sp_name_1)
193+
await transaction.create_savepoint(sp_name_1)
194194

195195

196196
async def test_transaction_cursor(

src/driver/transaction.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,8 @@ impl Transaction {
238238
pub async fn fetch_row(
239239
self_: Py<Self>,
240240
querystring: String,
241-
prepared: Option<bool>,
242241
parameters: Option<pyo3::Py<PyAny>>,
242+
prepared: Option<bool>,
243243
) -> RustPSQLDriverPyResult<PSQLDriverSinglePyQueryResult> {
244244
let (is_transaction_ready, db_client) = pyo3::Python::with_gil(|gil| {
245245
let self_ = self_.borrow(gil);

src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ fn psqlpy(py: Python<'_>, pymod: &Bound<'_, PyModule>) -> PyResult<()> {
2323
pymod.add_class::<driver::transaction_options::ReadVariant>()?;
2424
pymod.add_class::<driver::common_options::ConnRecyclingMethod>()?;
2525
pymod.add_class::<query_result::PSQLDriverPyQueryResult>()?;
26+
pymod.add_class::<query_result::PSQLDriverSinglePyQueryResult>()?;
2627
add_module(py, pymod, "extra_types", extra_types_module)?;
2728
add_module(py, pymod, "exceptions", python_exceptions_module)?;
2829
Ok(())

0 commit comments

Comments
 (0)