refactor: combine if statement + unwrap_or_else into one match

launchbadge · Dec 3, 2024 · 2705f20 · 2705f20
1 parent 6a78180
commit 2705f20
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 15 deletions.
diff --git a/sqlx-mysql/src/transaction.rs b/sqlx-mysql/src/transaction.rs
@@ -22,10 +22,13 @@ impl TransactionManager for MySqlTransactionManager {
     ) -> BoxFuture<'conn, Result<(), Error>> {
         Box::pin(async move {
             let depth = conn.inner.transaction_depth;
-            if statement.is_some() && depth > 0 {
-                return Err(Error::InvalidSavePointStatement);
-            }
-            let statement = statement.unwrap_or_else(|| begin_ansi_transaction_sql(depth));
+            let statement = match statement {
+                // custom `BEGIN` statements are not allowed if we're already in a transaction
+                // (we need to issue a `SAVEPOINT` instead)
+                Some(_) if depth > 0 => return Err(Error::InvalidSavePointStatement),
+                Some(statement) => statement,
+                None => begin_ansi_transaction_sql(depth),
+            };
             conn.execute(&*statement).await?;
             if !conn.in_transaction() {
                 return Err(Error::BeginFailed);

diff --git a/sqlx-postgres/src/transaction.rs b/sqlx-postgres/src/transaction.rs
@@ -20,10 +20,13 @@ impl TransactionManager for PgTransactionManager {
     ) -> BoxFuture<'conn, Result<(), Error>> {
         Box::pin(async move {
             let depth = conn.inner.transaction_depth;
-            if statement.is_some() && depth > 0 {
-                return Err(Error::InvalidSavePointStatement);
-            }
-            let statement = statement.unwrap_or_else(|| begin_ansi_transaction_sql(depth));
+            let statement = match statement {
+                // custom `BEGIN` statements are not allowed if we're already in
+                // a transaction (we need to issue a `SAVEPOINT` instead)
+                Some(_) if depth > 0 => return Err(Error::InvalidSavePointStatement),
+                Some(statement) => statement,
+                None => begin_ansi_transaction_sql(depth),
+            };
 
             let rollback = Rollback::new(conn);
             rollback.conn.queue_simple_query(&statement)?;

diff --git a/sqlx-sqlite/src/connection/worker.rs b/sqlx-sqlite/src/connection/worker.rs
@@ -184,17 +184,18 @@ impl ConnectionWorker {
                         Command::Begin { tx, statement } => {
                             let depth = conn.transaction_depth;
 
-                            let statement = if depth == 0 {
-                                statement.unwrap_or_else(|| begin_ansi_transaction_sql(depth))
-                            } else {
-                                if statement.is_some() {
+                            let statement = match statement {
+                                // custom `BEGIN` statements are not allowed if
+                                // we're already in a transaction (we need to
+                                // issue a `SAVEPOINT` instead)
+                                Some(_) if depth > 0 => {
                                     if tx.blocking_send(Err(Error::InvalidSavePointStatement)).is_err() {
                                         break;
                                     }
                                     continue;
-                                }
-
-                                begin_ansi_transaction_sql(depth)
+                                },
+                                Some(statement) => statement,
+                                None => begin_ansi_transaction_sql(depth),
                             };
 
                             let res =