Encapsulate some db operations in try-catch.

arnemorken · Dec 13, 2023 · 67756de · 67756de
1 parent 1cb3311
commit 67756de
Showing 1 changed file with 36 additions and 22 deletions.
diff --git a/data/mysql/db/dbTable.php b/data/mysql/db/dbTable.php
@@ -165,14 +165,21 @@ public function dbCreate($type,$tableFields,$unique)
     if (isset($unique))
       $sql .= ",UNIQUE KEY(".$unique.")";
     $sql .= ")";
-    //error_log("dbCreate,sql:$sql");
-    if ($this->query($sql)) {
-      error_log("Table $tableName created successfully");
-      return true;
+    error_log("dbCreate,sql:$sql");
+    try {
+      if ($this->query($sql)) {
+        error_log("Table $tableName created successfully");
+        return true;
+      }
+      $this->mError = "dbTable::dbCreate: Error creating table $tableName:".$this->getError();
+      error_log($this->mError);
+      return false;
+    }
+    catch (Exception $e) {
+        $this->mError = "dbCreate::query: Exception: ".$e->getMessage();
+        $this->mError .= "\nQuery was: ".$sql;
+        error_log($this->mError);
     }
-    $this->mError = "dbTable::dbCreate: Error creating table $tableName:".$this->getError();
-    error_log($this->mError);
-    return false;
   } // dbCreate
 
   /**
@@ -195,28 +202,35 @@ public function query($stmt)
       return false;
     }
     //error_log("dbTable.query:".$stmt);
-    if (substr($stmt,0,6) == "SELECT") {
-      try {
-        $this->mDBResult = $this->mDBConnection->mDBHandle->query($stmt);
-        if (!$this->mDBResult) {
-          $this->mError = "dbTable::query3: ".$this->mDBConnection->getError();
-          $this->mError .= "<br/>\nQuery was: ".$stmt;
+    try {
+      if (substr($stmt,0,6) == "SELECT") {
+        try {
+          $this->mDBResult = $this->mDBConnection->mDBHandle->query($stmt);
+          if (!$this->mDBResult) {
+            $this->mError = "dbTable::query3: ".$this->mDBConnection->getError();
+            $this->mError .= "<br/>\nQuery was: ".$stmt;
+            error_log($this->mError);
+          }
+        }
+        catch (Exception $e) {
+          $this->mError = "dbTable::query4: Exception: ".$e->getMessage();
+          $this->mError .= "\nQuery was: ".$stmt;
           error_log($this->mError);
         }
       }
-      catch (Exception $e) {
-        $this->mError = "dbTable::query4: Exception: ".$e->getMessage();
-        $this->mError .= "\nQuery was: ".$stmt;
-        error_log($this->mError);
+      else {
+        $this->mNumRowsChanged = $this->mDBConnection->mDBHandle->exec($stmt);
+        if ($this->mNumRowsChanged === false) {
+          $this->mError = "dbTable::query5: ".$this->mDBConnection->getError();
+          $this->mError .= "\nQuery was: ".$stmt;
+          error_log($this->mError);
+        }
       }
     }
-    else {
-      $this->mNumRowsChanged = $this->mDBConnection->mDBHandle->exec($stmt);
-      if ($this->mNumRowsChanged === false) {
-        $this->mError = "dbTable::query5: ".$this->mDBConnection->getError();
+    catch (Exception $e) {
+        $this->mError = "query::query: Exception: ".$e->getMessage();
         $this->mError .= "\nQuery was: ".$stmt;
         error_log($this->mError);
-      }
     }
     return !$this->isError(); // Return true if ok
   } // query