claunia/qemudb
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

testData: Simplify SQL code

Browse Source
This commit is contained in:
Alexander Nicolaysen Sørnes
2007-11-06 22:25:30 +01:00
committed by Chris Morgan
parent b3e71b0a81
commit 0776bdeeb9
1 changed files with 4 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
include/testData.php
View File

@@ -920,11 +920,7 @@ class testData{
if($bRejected) if($bRejected)
{ {
$sQuery = "SELECT COUNT(testingId) AS count FROM $sQuery = "SELECT COUNT(testingId) AS count FROM
testResults, appVersion WHERE testResults WHERE
appVersion.queued = 'false'
AND
appVersion.versionId = testResults.versionId
AND
testResults.submitterId = '?' testResults.submitterId = '?'
AND AND
testResults.queued = '?'"; testResults.queued = '?'";
@@ -934,8 +930,6 @@ class testData{
testResults, appVersion, appMaintainers WHERE testResults, appVersion, appMaintainers WHERE
testResults.versionId = appVersion.versionId testResults.versionId = appVersion.versionId
AND AND
appVersion.queued = 'false'
AND
appMaintainers.userId = '?' appMaintainers.userId = '?'
AND AND
appMaintainers.queued = 'false' appMaintainers.queued = 'false'
@@ -961,12 +955,7 @@ class testData{
$sQueued); $sQueued);
} else } else
{ {
$sQuery = "SELECT COUNT(testingId) as count FROM testResults, $sQuery = "SELECT COUNT(testingId) as count FROM testResults WHERE
appVersion WHERE
appVersion.versionId = testResults.versionId
AND
appVersion.queued = 'false'
AND
testResults.queued = '?'"; testResults.queued = '?'";
$hResult = query_parameters($sQuery, $sQueued); $hResult = query_parameters($sQuery, $sQueued);
} }
@@ -1002,11 +991,7 @@ class testData{
{ {
if($bRejected) if($bRejected)
{ {
$sQuery = "SELECT testResults.* FROM testResults, appVersion WHERE $sQuery = "SELECT testResults.* FROM testResults WHERE
appVersion.queued = 'false'
AND
appVersion.versionId = testResults.versionId
AND
testResults.submitterId = '?' testResults.submitterId = '?'
AND AND
testResults.queued = '?' ORDER BY ?$sLimit"; testResults.queued = '?' ORDER BY ?$sLimit";
@@ -1018,8 +1003,6 @@ class testData{
AND AND
appMaintainers.userId = '?' appMaintainers.userId = '?'
AND AND
appVersion.queued = 'false'
AND
( (
( (
appMaintainers.superMaintainer = '1' appMaintainers.superMaintainer = '1'
@@ -1049,11 +1032,7 @@ class testData{
} }
} else } else
{ {
$sQuery = "SELECT testResults.* FROM testResults, appVersion WHERE $sQuery = "SELECT testResults.* FROM testResults WHERE
testResults.versionId = appVersion.versionId
AND
appVersion.queued = 'false'
AND
testResults.queued = '?' ORDER by ?$sLimit"; testResults.queued = '?' ORDER by ?$sLimit";
if($sLimit) if($sLimit)
$hResult = query_parameters($sQuery, $sQueued, $sOrderBy, $iStart, $iRows); $hResult = query_parameters($sQuery, $sQueued, $sOrderBy, $iStart, $iRows);