From: Matteo Nastasi (mop) <nastasi@alternativeoutput.it>
Date: Thu, 23 Feb 2017 06:40:49 +0000 (+0100)
Subject: use transaction method instead of direct BEGIN/COMMIT/ROLLBACK queries
X-Git-Tag: v5.3.0~3
X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=commitdiff_plain;h=649907a529ae4bee21990c05f196a144dab8624b;p=brisk.git

use transaction method instead of direct BEGIN/COMMIT/ROLLBACK queries
---

diff --git a/web/briskin5/stat-day.php b/web/briskin5/stat-day.php
index cadeb26..a9fcdee 100644
--- a/web/briskin5/stat-day.php
+++ b/web/briskin5/stat-day.php
@@ -258,10 +258,10 @@ function main_pgsql($from, $to)
             break;
         }
 
-        if (pg_query($bdb->dbconn->db(), "BEGIN") == FALSE) {
-            log_crit("stat-day: begin failed");
-            break;
-        }
+        //if ($bdb->transaction("BEGIN") == FALSE) {
+        //    log_crit("stat-day: begin failed");
+        //    break;
+        //}
 
         // retrieve list of active tournaments
         $trn_sql = sprintf("SELECT * FROM %sbin5_tournaments WHERE active = 1;", $G_dbpfx);
@@ -482,12 +482,15 @@ SELECT sum(p.pts * (2^g.mult)) AS pts
             log_crit(sprintf("stat-day: t < trn_n (%d, %d)", $t, $trn_n));
             break;
         }
+        // if ($bdb->transaction("COMMIT") == FALSE) {
+        //     break;
+        // }
         $ret = (TRUE);
     } while (0);
 
-    if ($ret == FALSE) {
-        pg_query($bdb->dbconn->db(), "ROLLBACK");
-    }
+    // if ($ret == FALSE) {
+    //    $bdb->transaction("ROLLBACK");
+    // }
     if ($fpexp != FALSE) {
         fclose($fpexp);
     }
diff --git a/web/briskin5/statadm.php b/web/briskin5/statadm.php
index ee06e08..e88a9f9 100644
--- a/web/briskin5/statadm.php
+++ b/web/briskin5/statadm.php
@@ -225,7 +225,7 @@ function main_pgsql($curtime)
     $maxg = array( TRI_MAX_GAMES, MON_MAX_GAMES, WEE_MAX_GAMES );
 
     do {
-        if (pg_query($bdb->dbconn->db(), "BEGIN") == FALSE) {
+        if ($bdb->transaction("BEGIN") == FALSE) {
             log_crit("statadm: begin failed");
             break;
         }
@@ -400,13 +400,13 @@ function main_pgsql($curtime)
             break;                        
         }
         
-        if (pg_query($bdb->dbconn->db(), "COMMIT") == FALSE) {
+        if ($bdb->transaction("COMMIT") == FALSE) {
             break;
         }
         return (TRUE);
     } while (0);
 
-    pg_query($bdb->dbconn->db(), "ROLLBACK");
+    $bdb->transaction("ROLLBACK");
 
     return (FALSE);
 }