Transaction working with pure rust again

Transaction configuration working with pure rust client

Author: fernandobatels

rsfbclient-core/src/lib.rs

@@ -12,10 +12,10 @@ mod transaction;
 
 pub use charset::Charset;
 pub use connection::*;
-pub use transaction::*;
 pub use error::FbError;
 pub use params::*;
 pub use row::*;
+pub use transaction::*;
 
 #[derive(Debug, Clone)]
 /// Sql parameter / column data

rsfbclient-core/src/transaction.rs

@@ -49,7 +49,7 @@ pub enum TrLockResolution {
     /// In the WAIT model, transaction will wait till the other transaction has finished.
     ///
     /// If a TIMEOUT is specified for the WAIT transaction, waiting will continue only for the number of seconds specified
-    Wait(Option<u32>)
+    Wait(Option<u32>),
 }
 
 impl Default for TrLockResolution {

rsfbclient-native/src/connection.rs

@@ -203,7 +203,12 @@ impl<T: LinkageMarker> FirebirdClientSqlOps for NativeFbClient<T> {
         let mut handle = 0;
 
         // Transaction parameter buffer
-        let mut tpb = vec![ibase::isc_tpb_version3 as u8, confs.isolation.into(), confs.data_access as u8, confs.lock_resolution.into()];
+        let mut tpb = vec![
+            ibase::isc_tpb_version3 as u8,
+            confs.isolation.into(),
+            confs.data_access as u8,
+            confs.lock_resolution.into(),
+        ];
         if let TrLockResolution::Wait(Some(time)) = confs.lock_resolution {
             tpb.push(ibase::isc_tpb_lock_timeout as u8);
             tpb.push(4 as u8);

rsfbclient-rust/src/client.rs

@@ -16,10 +16,7 @@ use crate::{
     wire::*,
     xsqlda::{parse_xsqlda, xsqlda_to_blr, PrepareInfo, XSqlVar, XSQLDA_DESCRIBE_VARS},
 };
-use rsfbclient_core::{
-    ibase, Charset, Column, Dialect, FbError, FirebirdClientDbOps, FirebirdClientSqlOps,
-    FreeStmtOp, SqlType, StmtType, TrIsolationLevel, TrOp,
-};
+use rsfbclient_core::*;
 
 type RustDbHandle = DbHandle;
 type RustTrHandle = TrHandle;
@@ -170,11 +167,11 @@ impl FirebirdClientSqlOps for RustFbClient {
     fn begin_transaction(
         &mut self,
         db_handle: &mut Self::DbHandle,
-        isolation_level: TrIsolationLevel,
+        confs: TransactionConfiguration,
     ) -> Result<Self::TrHandle, FbError> {
         self.conn
             .as_mut()
-            .map(|conn| conn.begin_transaction(db_handle, isolation_level))
+            .map(|conn| conn.begin_transaction(db_handle, confs))
             .unwrap_or_else(err_client_not_connected)
     }
 
@@ -445,9 +442,23 @@ impl FirebirdWireConnection {
     pub fn begin_transaction(
         &mut self,
         db_handle: &mut DbHandle,
-        isolation_level: TrIsolationLevel,
+        confs: TransactionConfiguration,
     ) -> Result<TrHandle, FbError> {
-        let tpb = [ibase::isc_tpb_version3 as u8, isolation_level as u8];
+        let mut tpb = vec![
+            ibase::isc_tpb_version3 as u8,
+            confs.isolation.into(),
+            confs.data_access as u8,
+            confs.lock_resolution.into(),
+        ];
+        if let TrLockResolution::Wait(Some(time)) = confs.lock_resolution {
+            tpb.push(ibase::isc_tpb_lock_timeout as u8);
+            tpb.push(4 as u8);
+            tpb.extend_from_slice(&time.to_le_bytes());
+        }
+
+        if let TrIsolationLevel::ReadCommited(rec) = confs.isolation {
+            tpb.push(rec as u8);
+        }
 
         self.socket.write_all(&transaction(db_handle.0, &tpb))?;
         self.socket.flush()?;
@@ -1021,7 +1032,7 @@ fn connection_test() {
     let mut db_handle = conn.attach_database(db_name, user, pass).unwrap();
 
     let mut tr_handle = conn
-        .begin_transaction(&mut db_handle, TrIsolationLevel::Concurrency)
+        .begin_transaction(&mut db_handle, TransactionConfiguration::default())
         .unwrap();
 
     let (stmt_type, mut stmt_handle) = conn

src/connection/mod.rs

@@ -3,7 +3,10 @@
 //!
 //! Connection functions
 //!
-use rsfbclient_core::{Dialect, FbError, FirebirdClient, FirebirdClientDbOps, FromRow, IntoParams, TransactionConfiguration};
+use rsfbclient_core::{
+    Dialect, FbError, FirebirdClient, FirebirdClientDbOps, FromRow, IntoParams,
+    TransactionConfiguration,
+};
 use std::{marker, mem};
 
 use crate::{

src/tests/transaction.rs

@@ -119,7 +119,7 @@ mk_tests_default! {
         assert!(qr.is_err());
         let mut e = qr.err().unwrap().to_string();
         e.truncate(95);
-        assert_eq!("sql error -913: deadlock\nread conflicts with concurrent update\nconcurrent transaction number is", e);
+        assert!(e.contains("deadlock\nread conflicts with concurrent update\nconcurrent transaction number is"));
 
         drop(transaction2);
         drop(transaction1);
@@ -147,7 +147,7 @@ mk_tests_default! {
         assert!(qr.is_err());
         let mut e = qr.err().unwrap().to_string();
         e.truncate(95);
-        assert_eq!("sql error -913: deadlock\nread conflicts with concurrent update\nconcurrent transaction number is", e);
+        assert!(e.contains("deadlock\nread conflicts with concurrent update\nconcurrent transaction number is"));
 
         drop(transaction2);
         drop(transaction1);
@@ -169,7 +169,7 @@ mk_tests_default! {
         let qr = transaction1.execute_immediate(format!(insert_stmt_fmtstring!(), TABLE_NAME).as_str());
 
         assert!(qr.is_err());
-        assert_eq!("sql error -817: attempted update during read-only transaction", qr.err().unwrap().to_string());
+        assert!(qr.err().unwrap().to_string().contains("attempted update during read-only transaction"));
 
         drop(transaction1);
         teardown(conn, TABLE_NAME)
@@ -229,7 +229,7 @@ mk_tests_default! {
         assert!(qr.is_err());
         let mut e = qr.err().unwrap().to_string();
         e.truncate(52);
-        assert_eq!("sql error -901: lock conflict on no wait transaction", e);
+        assert!(e.contains("lock conflict on no wait transaction"));
 
         drop(transaction2);
         drop(transaction1);

src/transaction/mod.rs

@@ -4,7 +4,9 @@
 //! Transaction functions
 //!
 
-use rsfbclient_core::{FbError, FirebirdClient, FromRow, IntoParams, TransactionConfiguration, TrOp};
+use rsfbclient_core::{
+    FbError, FirebirdClient, FromRow, IntoParams, TrOp, TransactionConfiguration,
+};
 use std::marker;
 use std::mem;
 
@@ -27,7 +29,10 @@ where
 
 impl<'c, C: FirebirdClient> Transaction<'c, C> {
     /// Start a new transaction
-    pub fn new(conn: &'c mut Connection<C>, confs: TransactionConfiguration) -> Result<Self, FbError> {
+    pub fn new(
+        conn: &'c mut Connection<C>,
+        confs: TransactionConfiguration,
+    ) -> Result<Self, FbError> {
         let data = TransactionData::new(conn, confs)?;
 
         Ok(Transaction { data, conn })
@@ -229,9 +234,7 @@ where
 {
     /// Start a new transaction
     fn new(conn: &mut Connection<C>, confs: TransactionConfiguration) -> Result<Self, FbError> {
-        let handle = conn
-            .cli
-            .begin_transaction(&mut conn.handle, confs)?;
+        let handle = conn.cli.begin_transaction(&mut conn.handle, confs)?;
 
         Ok(Self { handle })
     }

src/transaction/simple.rs

@@ -98,7 +98,10 @@ impl<'c> TryFrom<SimpleTransaction<'c>> for Transaction<'c, RustFbClient> {
 
 impl<'c> SimpleTransaction<'c> {
     /// Start a new transaction
-    pub fn new(conn: &'c mut SimpleConnection, confs: TransactionConfiguration) -> Result<Self, FbError> {
+    pub fn new(
+        conn: &'c mut SimpleConnection,
+        confs: TransactionConfiguration,
+    ) -> Result<Self, FbError> {
         match &mut conn.inner {
             #[cfg(feature = "linking")]
             TypeConnectionContainer::NativeDynLink(tr) => Ok(Transaction::new(tr, confs)?.into()),