Skip to content

Commit e966803

Browse files
committed
transaction deferable
1 parent eef2e5d commit e966803

File tree

5 files changed

+17
-17
lines changed

5 files changed

+17
-17
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ In process of transaction creation it is possible to specify some arguments to c
176176

177177
- `isolation_level`: level of the isolation. By default - `None`.
178178
- `read_variant`: read option. By default - `None`.
179-
- `deferable`: deferable option. By default - `None`.
179+
- `deferrable`: deferrable option. By default - `None`.
180180

181181
### You can use transactions as async context managers
182182

python/psqlpy/_internal/__init__.pyi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ class Connection:
466466
self,
467467
isolation_level: IsolationLevel | None = None,
468468
read_variant: ReadVariant | None = None,
469-
deferable: bool | None = None,
469+
deferrable: bool | None = None,
470470
) -> Transaction:
471471
"""Create new transaction.
472472

python/tests/test_transaction.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,33 +13,33 @@ async def test_transaction_init_parameters(psql_pool: PSQLPool) -> None:
1313
connection = await psql_pool.connection()
1414

1515
test_init_parameters: typing.Final[list[dict[str, typing.Any]]] = [
16-
{"isolation_level": None, "deferable": None, "read_variant": None},
16+
{"isolation_level": None, "deferrable": None, "read_variant": None},
1717
{
1818
"isolation_level": IsolationLevel.ReadCommitted,
19-
"deferable": True,
19+
"deferrable": True,
2020
"read_variant": ReadVariant.ReadOnly,
2121
},
2222
{
2323
"isolation_level": IsolationLevel.ReadUncommitted,
24-
"deferable": False,
24+
"deferrable": False,
2525
"read_variant": ReadVariant.ReadWrite,
2626
},
2727
{
2828
"isolation_level": IsolationLevel.RepeatableRead,
29-
"deferable": True,
29+
"deferrable": True,
3030
"read_variant": ReadVariant.ReadOnly,
3131
},
3232
{
3333
"isolation_level": IsolationLevel.Serializable,
34-
"deferable": False,
34+
"deferrable": False,
3535
"read_variant": ReadVariant.ReadWrite,
3636
},
3737
]
3838

3939
for init_parameters in test_init_parameters:
4040
connection.transaction(
4141
isolation_level=init_parameters.get("isolation_level"),
42-
deferable=init_parameters.get("deferable"),
42+
deferrable=init_parameters.get("deferrable"),
4343
read_variant=init_parameters.get("read_variant"),
4444
)
4545

src/driver/connection.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ impl Connection {
6666
&self,
6767
isolation_level: Option<IsolationLevel>,
6868
read_variant: Option<ReadVariant>,
69-
deferable: Option<bool>,
69+
deferrable: Option<bool>,
7070
) -> Transaction {
7171
let inner_transaction = RustTransaction::new(
7272
self.db_client.clone(),
@@ -75,7 +75,7 @@ impl Connection {
7575
Arc::new(tokio::sync::RwLock::new(HashSet::new())),
7676
isolation_level,
7777
read_variant,
78-
deferable,
78+
deferrable,
7979
Default::default(),
8080
);
8181

src/driver/transaction.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ pub struct RustTransaction {
2727

2828
isolation_level: Option<IsolationLevel>,
2929
read_variant: Option<ReadVariant>,
30-
deferable: Option<bool>,
30+
deferrable: Option<bool>,
3131
cursor_num: usize,
3232
}
3333

@@ -40,7 +40,7 @@ impl RustTransaction {
4040
rollback_savepoint: Arc<tokio::sync::RwLock<HashSet<String>>>,
4141
isolation_level: Option<IsolationLevel>,
4242
read_variant: Option<ReadVariant>,
43-
deferable: Option<bool>,
43+
deferrable: Option<bool>,
4444
cursor_num: usize,
4545
) -> Self {
4646
Self {
@@ -50,7 +50,7 @@ impl RustTransaction {
5050
rollback_savepoint,
5151
isolation_level,
5252
read_variant,
53-
deferable,
53+
deferrable,
5454
cursor_num,
5555
}
5656
}
@@ -108,7 +108,7 @@ impl RustTransaction {
108108

109109
/// Start transaction
110110
/// Set up isolation level if specified
111-
/// Set up deferable if specified
111+
/// Set up deferrable if specified
112112
///
113113
/// # Errors
114114
/// May return Err Result if cannot execute querystring.
@@ -124,10 +124,10 @@ impl RustTransaction {
124124
querystring.push_str(format!(" {}", &read_var.to_str_option()).as_str());
125125
}
126126

127-
if self.deferable.is_some() {
128-
querystring.push_str("DEFERABLE");
127+
if self.deferrable.is_some() {
128+
querystring.push_str(" DEFERRABLE");
129129
} else {
130-
querystring.push_str("NOT DEFERABLE");
130+
querystring.push_str(" NOT DEFERRABLE");
131131
}
132132

133133
let db_client_arc = self.db_client.clone();

0 commit comments

Comments
 (0)