Alexander Nicolaysen Sørnes : testData: Simplify SQL code
Chris Morgan
cmorgan at winehq.org
Tue Nov 6 23:23:34 CST 2007
Module: appdb
Branch: master
Commit: 0776bdeeb94fadb500a6ee66ad14774ca0f3543b
URL: http://source.winehq.org/git/appdb.git/?a=commit;h=0776bdeeb94fadb500a6ee66ad14774ca0f3543b
Author: Alexander Nicolaysen Sørnes <alex at thehandofagony.com>
Date: Tue Nov 6 22:25:30 2007 +0100
testData: Simplify SQL code
---
include/testData.php | 29 ++++-------------------------
1 files changed, 4 insertions(+), 25 deletions(-)
diff --git a/include/testData.php b/include/testData.php
index 0605c81..a1d4b42 100644
--- a/include/testData.php
+++ b/include/testData.php
@@ -920,11 +920,7 @@ class testData{
if($bRejected)
{
$sQuery = "SELECT COUNT(testingId) AS count FROM
- testResults, appVersion WHERE
- appVersion.queued = 'false'
- AND
- appVersion.versionId = testResults.versionId
- AND
+ testResults WHERE
testResults.submitterId = '?'
AND
testResults.queued = '?'";
@@ -934,8 +930,6 @@ class testData{
testResults, appVersion, appMaintainers WHERE
testResults.versionId = appVersion.versionId
AND
- appVersion.queued = 'false'
- AND
appMaintainers.userId = '?'
AND
appMaintainers.queued = 'false'
@@ -961,12 +955,7 @@ class testData{
$sQueued);
} else
{
- $sQuery = "SELECT COUNT(testingId) as count FROM testResults,
- appVersion WHERE
- appVersion.versionId = testResults.versionId
- AND
- appVersion.queued = 'false'
- AND
+ $sQuery = "SELECT COUNT(testingId) as count FROM testResults WHERE
testResults.queued = '?'";
$hResult = query_parameters($sQuery, $sQueued);
}
@@ -1002,11 +991,7 @@ class testData{
{
if($bRejected)
{
- $sQuery = "SELECT testResults.* FROM testResults, appVersion WHERE
- appVersion.queued = 'false'
- AND
- appVersion.versionId = testResults.versionId
- AND
+ $sQuery = "SELECT testResults.* FROM testResults WHERE
testResults.submitterId = '?'
AND
testResults.queued = '?' ORDER BY ?$sLimit";
@@ -1018,8 +1003,6 @@ class testData{
AND
appMaintainers.userId = '?'
AND
- appVersion.queued = 'false'
- AND
(
(
appMaintainers.superMaintainer = '1'
@@ -1049,11 +1032,7 @@ class testData{
}
} else
{
- $sQuery = "SELECT testResults.* FROM testResults, appVersion WHERE
- testResults.versionId = appVersion.versionId
- AND
- appVersion.queued = 'false'
- AND
+ $sQuery = "SELECT testResults.* FROM testResults WHERE
testResults.queued = '?' ORDER by ?$sLimit";
if($sLimit)
$hResult = query_parameters($sQuery, $sQueued, $sOrderBy, $iStart, $iRows);
More information about the wine-cvs
mailing list