From 85cca718e308779a56dbf302140ce9088fc0727a Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Tue, 11 Jun 2024 00:11:58 -0700
Subject: Throw an error when changes can't be committed to the database

I was testing and another process had the database open, so it couldn't commit
changes. This wasn't apparent from the UI because it would just silently assume
a commit went fine.
---
 src/SemanticScuttle/Service/User.php | 37 ++++++++++++++++++++++++++++++++----
 1 file changed, 33 insertions(+), 4 deletions(-)

(limited to 'src/SemanticScuttle/Service/User.php')

diff --git a/src/SemanticScuttle/Service/User.php b/src/SemanticScuttle/Service/User.php
index d527031..dbbb202 100644
--- a/src/SemanticScuttle/Service/User.php
+++ b/src/SemanticScuttle/Service/User.php
@@ -202,7 +202,15 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService
             );
             return false;
         }
-        $this->db->sql_transaction('commit');
+
+        if (!$this->db->sql_transaction('commit')) {
+            $this->db->sql_transaction('rollback');
+            message_die(
+                GENERAL_ERROR, 'Could not commit user update', '',
+                __LINE__, __FILE__, $sql, $this->db
+            );
+            return false;
+        }
 
         // Everything worked out, so return true.
         return true;
@@ -707,7 +715,12 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService
             }
         }
 
-        $this->db->sql_transaction('commit');
+        if (!$this->db->sql_transaction('commit')) {
+            $this->db->sql_transaction('rollback');
+            message_die(GENERAL_ERROR, 'Could not commit adding user to watch list', '', __LINE__, __FILE__, $sql, $this->db);
+            return false;
+        }
+
         return true;
     }
 
@@ -751,7 +764,15 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService
             return false;
         }
         $uId = $this->db->sql_nextid($dbresult);
-        $this->db->sql_transaction('commit');
+
+        if (!$this->db->sql_transaction('commit')) {
+            $this->db->sql_transaction('rollback');
+            message_die(
+                GENERAL_ERROR, 'Could not commit user',
+                '', __LINE__, __FILE__, $sql, $this->db
+            );
+            return false;
+        }
 
         return $uId;
     }
@@ -833,7 +854,15 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService
             );
             return false;
         }
-        $this->db->sql_transaction('commit');
+
+        if (!$this->db->sql_transaction('commit')) {
+            $this->db->sql_transaction('rollback');
+            message_die(
+                GENERAL_ERROR, 'Could not commit user update', '',
+                __LINE__, __FILE__, $sql, $this->db
+            );
+            return false;
+        }
 
         // Everything worked out, so return true.
         return true;
-- 
cgit v1.2.3-54-g00ecf