Update team member in composer.json. Add transaction feature for DOQu…

…ery Class
ilham-fuead · Jun 9, 2023 · 61f90c4 · 61f90c4
1 parent 3af2e5b
commit 61f90c4
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 30 deletions.
diff --git a/composer.json b/composer.json
@@ -36,8 +36,8 @@
             "role": "Developer"
         },
         {
-            "name": "Rizuwan Saar",
-            "email": "rizuwan.saar@jpa.gov.my",
+            "name": "Che Razali Bin Che Zainul",
+            "email": "mustar.garage@gmail.com",
             "role": "Developer"
         }
     ],

diff --git a/src/mandryn_v1/DOQuery.php b/src/mandryn_v1/DOQuery.php
@@ -124,6 +124,7 @@ class DOQuery extends DB {
     private $num_rows;
 
     public function __construct($host, $username, $password, $database_name, $is_DB_connection_limit_enforced = true, $db_driver = 'mysql') {
+        $this->transactionEnable=false;
         try {
             if (DOQuery::$totalInstance > DOQuery::MAX_TOTAL_INSTANCE && $is_DB_connection_limit_enforced) {
                 $errMsg = 'DBQuery error : Maximum connection limit exceeded!';
@@ -142,31 +143,32 @@ public function __construct($host, $username, $password, $database_name, $is_DB_
     }
 
     public function enableTransaction() {
-        $this->transactionEnable = TRUE;
-        mysqli_autocommit($this->db_link, FALSE);
+        $this->transactionEnable = true;     
+        $this->db_link->beginTransaction();
     }
 
+    //TODO: Mark for remove
     public function disableTransaction() {
-        $this->transactionEnable = FALSE;
-        mysqli_autocommit($this->db_link, TRUE);
+        $this->transactionEnable = false;
     }
 
     public function commitTransaction() {
-        $clearedStatusFlag = TRUE;
+        $clearedStatusFlag = true;
         foreach ($this->executionStatusArray as $execution) {
-            if ($execution->status === FALSE) {
-                $clearedStatusFlag = FALSE;
+            if ($execution->status === false) {
+                $clearedStatusFlag = false;
                 break;
             }
         }
-
+        
         $copiedExecutionStatusArray = $this->executionStatusArray;
         $this->executionStatusArray = [];
 
         if ($clearedStatusFlag === TRUE) {
-            return mysqli_commit($this->db_link);
+            $this->disableTransaction();
+            return $this->db_link->commit();
         } else {
-            mysqli_rollback($this->db_link);
+            $this->db_link->rollback();
             return $copiedExecutionStatusArray;
         }
     }
@@ -179,6 +181,7 @@ public function setSQL_Statement($sql) {
         //$this->freeRecordset();
         $this->db_sql = $sql;
         $dbh = $this->db_link;
+
         $this->db_statement = $dbh->query($this->db_sql);
     }
 
@@ -208,30 +211,31 @@ private function countNumRows() {
         }
     }
 
-    public function execDataCommand(){
+    public function execDataCommand($db_sql){        
+
         $this->commandType= DOQuery::SQL_TYPE_COMMAND;
+
+        $CmdStatus=new MagicObject();
+
+        $CmdStatus->status=true;
+        $CmdStatus->message='success';
+
         try{
-            $this->db_result=$this->db_link->exec($this->db_sql);
+            $this->db_result=$this->db_link->exec($db_sql);
         }catch (PDOException $e) {
-
-            header("{$_SERVER['SERVER_PROTOCOL']} 500 {$e->getMessage()}");
-            exit;
+            $CmdStatus->status=false;
+            $CmdStatus->message=$e->getMessage();
+            //header("{$_SERVER['SERVER_PROTOCOL']} 500 {$e->getMessage()}");
+            //exit;
         }
-    }
-
-    private function recordExecutionStatus() {
-        $SQL_execution = new MagicObject();
 
-        if ($this->getCommandStatus() === TRUE) {
-            $SQL_execution->status = TRUE;
-            $SQL_execution->message = "success";
-        } else {
-            $SQL_execution->status = FALSE;
-            $SQL_execution->message = mysqli_error($this->getLink());
-            ;
+        if($this->transactionEnable){
+            $this->recordExecutionStatus($CmdStatus);
         }
-
-        $this->executionStatusArray[] = $SQL_execution;
+    }
+
+    private function recordExecutionStatus($CmdStatus) {
+        $this->executionStatusArray[] = $CmdStatus;
     }
 
     public function getQueryResult() {