Alexander Nicolaysen Sørnes : Order a version's testData table by Wine version, then date
Chris Morgan
cmorgan at winehq.org
Wed Dec 19 20:03:30 CST 2007
Module: appdb
Branch: master
Commit: 42239a63789ec72285523ae24e6174c23edbaadf
URL: http://source.winehq.org/git/appdb.git/?a=commit;h=42239a63789ec72285523ae24e6174c23edbaadf
Author: Alexander Nicolaysen Sørnes <alex at thehandofagony.com>
Date: Thu Dec 20 01:37:48 2007 +0100
Order a version's testData table by Wine version, then date
---
include/testData.php | 20 ++++++++++++++------
unit_test/test_testData.php | 2 ++
2 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/include/testData.php b/include/testData.php
index 81a308d..8dbf0a0 100644
--- a/include/testData.php
+++ b/include/testData.php
@@ -621,16 +621,20 @@ class testData{
$bShowAll = ($aClean['bShowAll'] == "true") ? true : false;
$sQuery = "SELECT *
- FROM testResults
+ FROM testResults, ?.versions
WHERE versionId = '?'
AND
+ versions.value = testResults.testedRelease
+ AND
+ versions.product_id = '?'
+ AND
state = '?'
- ORDER BY testedDate DESC";
+ ORDER BY versions.id DESC,testedDate DESC";
if(!$bShowAll)
$sQuery.=" LIMIT 0,".$iDisplayLimit;
- $hResult = query_parameters($sQuery, $this->iVersionId, 'accepted');
+ $hResult = query_parameters($sQuery, BUGZILLA_DB, $this->iVersionId, BUGZILLA_PRODUCT_ID, 'accepted');
if(!$hResult)
return;
@@ -682,13 +686,17 @@ class testData{
/* retrieve the latest test result for a given version id */
function getNewestTestIdFromVersionId($iVersionId, $sState = 'accepted')
{
- $sQuery = "SELECT testingId FROM testResults WHERE
+ $sQuery = "SELECT testingId FROM testResults, ?.versions WHERE
+ versions.value = testResults.testedRelease
+ AND
+ versions.product_id = '?'
+ AND
versionId = '?'
AND
state = '?'
- ORDER BY testedDate DESC limit 1";
+ ORDER BY versions.id DESC,testedDate DESC limit 1";
- $hResult = query_parameters($sQuery, $iVersionId, $sState);
+ $hResult = query_parameters($sQuery, BUGZILLA_DB, BUGZILLA_PRODUCT_ID, $iVersionId, $sState);
if(!$hResult)
return 0;
diff --git a/unit_test/test_testData.php b/unit_test/test_testData.php
index c17fdcb..f79f23a 100644
--- a/unit_test/test_testData.php
+++ b/unit_test/test_testData.php
@@ -18,11 +18,13 @@ function test_testData_getNewestTestidFromVersionId()
$oOldTestData = new testData();
$oOldTestData->iVersionId = $iVersionId;
+ $oOldTestData->sTestedRelease = '0.9.50.';
if(!$oOldTestData->create())
error("oOldTestData->create() failed");
$oNewTestData = new testData();
$oNewTestData->iVersionId = $iVersionId;
+ $oNewTestData->sTestedRelease = '0.9.51.';
if(!$oNewTestData->create())
error("oNewTestData->create() failed");
More information about the wine-cvs
mailing list