testData: Simplify SQL code
This commit is contained in:
committed by
Chris Morgan
parent
b3e71b0a81
commit
0776bdeeb9
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user