[Hide Content]From c21124174770e21b0d3a356f7444a390a24ca59b Mon Sep 17 00:00:00 2001
From: Igor Murzov <e-mail@date.by>
Date: Sat, 24 May 2014 23:59:52 +0400
Subject: [PATCH] BUG: Make user statistics calculation PostgreSQL-compatible
---
models/build.php | 36 ++++++++++++++++++++----------------
1 file changed, 20 insertions(+), 16 deletions(-)
diff --git a/models/build.php b/models/build.php
index 97c351c..9f3029d 100644
--- a/models/build.php
+++ b/models/build.php
@@ -1177,14 +1177,16 @@ class Build
$nfixedtests = abs($testdiff);
}
- pdo_query("UPDATE userstatistics SET totalupdatedfiles=totalupdatedfiles+1,
- totalbuilds=totalbuilds+'$totalbuilds',
- nfixedwarnings=nfixedwarnings+'$nfixedwarnings',
- nfailedwarnings=nfailedwarnings+'$nfailedwarnings',
- nfixederrors=nfixederrors+'$nfixederrors',
- nfailederrors=nfailederrors+'$nfailederrors',
- nfixedtests=nfixedtests+'$nfixedtests',
- nfailedtests=nfailedtests+'$nfailedtests' WHERE userid=".qnum($userid)." AND projectid=".qnum($this->ProjectId)." AND checkindate>='$checkindate'");
+ pdo_query("UPDATE userstatistics
+ SET totalupdatedfiles=totalupdatedfiles+".qnum(1).",
+ totalbuilds=totalbuilds+".qnum($totalbuilds).",
+ nfixedwarnings=nfixedwarnings+".qnum($nfixedwarnings).",
+ nfailedwarnings=nfailedwarnings+".qnum($nfailedwarnings).",
+ nfixederrors=nfixederrors+".qnum($nfixederrors).",
+ nfailederrors=nfailederrors+".qnum($nfailederrors).",
+ nfixedtests=nfixedtests+".qnum($nfixedtests).",
+ nfailedtests=nfailedtests+".qnum($nfailedtests)."
+ WHERE userid=".qnum($userid)." AND projectid=".qnum($this->ProjectId)." AND checkindate>='$checkindate'");
add_last_sql_error("Build:AddUpdateStatistics",$this->ProjectId,$this->Id);
}
else // insert into the database
@@ -1229,14 +1231,16 @@ class Build
$totalbuilds=1;
}
- pdo_query("UPDATE userstatistics SET totalupdatedfiles=totalupdatedfiles+1,
- totalbuilds=totalbuilds+1,
- nfixedwarnings=nfixedwarnings+'$nfixedwarnings',
- nfailedwarnings=nfailedwarnings+'$nfailedwarnings',
- nfixederrors=nfixederrors+'$nfixederrors',
- nfailederrors=nfailederrors+'$nfailederrors',
- nfixedtests=nfixedtests+'$nfixedtests',
- nfailedtests=nfailedtests+'$nfailedtests' WHERE userid=".qnum($userid)." AND projectid=".qnum($this->ProjectId)." AND checkindate>'$checkindate'");
+ pdo_query("UPDATE userstatistics
+ SET totalupdatedfiles=totalupdatedfiles+".qnum(1).",
+ totalbuilds=totalbuilds+".qnum(1).",
+ nfixedwarnings=nfixedwarnings+".qnum($nfixedwarnings).",
+ nfailedwarnings=nfailedwarnings+".qnum($nfailedwarnings).",
+ nfixederrors=nfixederrors+".qnum($nfixederrors).",
+ nfailederrors=nfailederrors+".qnum($nfailederrors).",
+ nfixedtests=nfixedtests+".qnum($nfixedtests).",
+ nfailedtests=nfailedtests+".qnum($nfailedtests)."
+ WHERE userid=".qnum($userid)." AND projectid=".qnum($this->ProjectId)." AND checkindate>'$checkindate'");
add_last_sql_error("Build:AddUpdateStatistics",$this->ProjectId,$this->Id);
--
1.8.4