summaryrefslogtreecommitdiffstats
path: root/non-puppet/qtmetrics2/src/Database.php
diff options
context:
space:
mode:
authorJuha Sippola <juhasippola@outlook.com>2015-09-21 16:58:20 +0300
committerTony Sarajärvi <tony.sarajarvi@theqtcompany.com>2015-09-23 09:40:21 +0000
commitf7e77d6927f91e24b04cecf91d6fcc745d8cddec (patch)
treee106d6c893738e5948262ae1660928f6d5f90f65 /non-puppet/qtmetrics2/src/Database.php
parentec7ce827151e562050fcc2eb9e8a8f9c67e9cfa1 (diff)
Qt Metrics 2 (v0.32): Branch order
Changed the branch order to list first the 'dev', then the highest number etc. Change-Id: I43eaa908795fff7e0f10266abc489b3c97441326 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@theqtcompany.com>
Diffstat (limited to 'non-puppet/qtmetrics2/src/Database.php')
-rw-r--r--non-puppet/qtmetrics2/src/Database.php22
1 files changed, 11 insertions, 11 deletions
diff --git a/non-puppet/qtmetrics2/src/Database.php b/non-puppet/qtmetrics2/src/Database.php
index a7d5aff..bc4fea6 100644
--- a/non-puppet/qtmetrics2/src/Database.php
+++ b/non-puppet/qtmetrics2/src/Database.php
@@ -81,7 +81,7 @@ class Database {
public function getBranches()
{
$result = array();
- $query = $this->db->prepare("SELECT name, archived FROM branch ORDER BY name");
+ $query = $this->db->prepare("SELECT name, archived FROM branch ORDER BY name DESC");
$query->execute(array());
while($row = $query->fetch(PDO::FETCH_ASSOC)) {
$result[] = array(
@@ -890,7 +890,7 @@ class Database {
project_run.project_id = (SELECT id FROM project WHERE name = ?) AND
project_run.state_id = (SELECT id FROM state WHERE name = ?) AND
branch.archived = 0
- ORDER BY branch.name, project_run.timestamp DESC;
+ ORDER BY branch.name DESC, project_run.timestamp DESC;
");
$query->execute(array(
$runProject,
@@ -933,7 +933,7 @@ class Database {
project_run.project_id = (SELECT id FROM project WHERE name = ?) AND
project_run.state_id = (SELECT id FROM state WHERE name = ?) AND
branch.archived = 0
- ORDER BY branch.name, conf, project_run.timestamp DESC;
+ ORDER BY branch.name DESC, conf, project_run.timestamp DESC;
");
$query->execute(array(
$runProject,
@@ -983,7 +983,7 @@ class Database {
project_run.state_id = (SELECT id FROM state WHERE name = ?) AND
conf.target_id IN (SELECT id FROM platform WHERE os = ?) AND
branch.archived = 0
- ORDER BY branch.name, conf, project_run.timestamp DESC;
+ ORDER BY branch.name DESC, conf, project_run.timestamp DESC;
");
$query->execute(array(
$runProject,
@@ -1034,7 +1034,7 @@ class Database {
project_run.state_id = (SELECT id FROM state WHERE name = ?) AND
conf.name = ? AND
branch.archived = 0
- ORDER BY branch.name, conf, project_run.timestamp DESC;
+ ORDER BY branch.name DESC, conf, project_run.timestamp DESC;
");
$query->execute(array(
$runProject,
@@ -1089,7 +1089,7 @@ class Database {
project_run.project_id = (SELECT id FROM project WHERE name = ?) AND
project_run.state_id = (SELECT id FROM state WHERE name = ?) AND
branch.archived = 0
- ORDER BY branch.name, conf.name, project_run.timestamp DESC;
+ ORDER BY branch.name DESC, conf.name, project_run.timestamp DESC;
");
$query->execute(array(
$testset,
@@ -1143,7 +1143,7 @@ class Database {
project_run.state_id = (SELECT id FROM state WHERE name = ?) AND
branch.archived = 0
GROUP BY branch.name, project_run.build_key, conf.name
- ORDER BY branch.name, conf.name, project_run.build_key DESC;
+ ORDER BY branch.name DESC, conf.name, project_run.build_key DESC;
");
$query->execute(array(
$testsetProject,
@@ -1198,7 +1198,7 @@ class Database {
project_run.project_id = (SELECT id FROM project WHERE name = ?) AND
project_run.state_id = (SELECT id FROM state WHERE name = ?) AND
branch.archived = 0
- ORDER BY branch.name, project.name, testset.name, project_run.build_key DESC;
+ ORDER BY branch.name DESC, project.name, testset.name, project_run.build_key DESC;
");
$query->execute(array(
$conf,
@@ -1256,7 +1256,7 @@ class Database {
project_run.project_id = (SELECT id FROM project WHERE name = ?) AND
project_run.state_id = (SELECT id FROM state WHERE name = ?) AND
branch.archived = 0
- ORDER BY branch.name, testset.name, project_run.build_key DESC;
+ ORDER BY branch.name DESC, testset.name, project_run.build_key DESC;
");
$query->execute(array(
$testsetProject,
@@ -1317,7 +1317,7 @@ class Database {
project_run.project_id = (SELECT id FROM project WHERE name = ?) AND
project_run.state_id = (SELECT id FROM state WHERE name = ?) AND
branch.archived = 0
- ORDER BY branch.name, testfunction.name, project_run.build_key DESC;
+ ORDER BY branch.name DESC, testfunction.name, project_run.build_key DESC;
");
$query->execute(array(
$testset,
@@ -1380,7 +1380,7 @@ class Database {
project_run.project_id = (SELECT id FROM project WHERE name = ?) AND
project_run.state_id = (SELECT id FROM state WHERE name = ?) AND
branch.archived = 0
- ORDER BY branch.name, testrow.name, project_run.build_key DESC;
+ ORDER BY branch.name DESC, testrow.name, project_run.build_key DESC;
");
$query->execute(array(
$testfunction,