Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

b=383749

Browse Source 
- fix table aliases


git-svn-id: svn://10.0.0.236/trunk@227703 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
ccooper%deadsquid.com 2007-06-08 16:52:30 +00:00
parent 4a428b7d00
commit 11c048021a
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mozilla/webtools/litmus/Litmus/DB/Subgroup.pm
View File

@ -149,8 +149,9 @@ sub coverage() {
$sql .= " AND tr.user_id=" . $user->{'user_id'};
}
if ($trusted) {
$sql .= " AND tr.user_id=u.user_id AND u.user_id=ugm.user_id AND ugm.group_id=sd.group_id ";
$sql .= " AND (sd.grouptype=1 OR sd.grouptype=3)";
$sql .= " AND tr.user_id=u.user_id AND u.user_id=ugm.user_id AND ugm.group_id=sg.group_id ";
$sql .= " AND (sg.grouptype=1 OR sg.grouptype=3)";
}
$sql .= " GROUP BY tr.testcase_id";

6
mozilla/webtools/litmus/Litmus/DB/TestRun.pm
View File

@ -355,7 +355,7 @@ $sql .= " WHERE
if ($trusted) {
$sql .= " AND tr.user_id=u.user_id AND u.user_id=ugm.user_id AND
ugm.group_id=sd.group_id AND (secgrps.grouptype=1 OR secgrps.grouptype=3)";
ugm.group_id=secgrps.group_id AND (secgrps.grouptype=1 OR secgrps.grouptype=3)";
}
$sql .= $self->getCriteriaSql();
@ -420,7 +420,7 @@ $sql .= " WHERE
if ($trusted) {
$sql .= " AND tr.user_id=u.user_id AND u.user_id=ugm.user_id AND
ugm.group_id=sd.group_id AND (secgrps.grouptype=1 OR secgrps.grouptype=3)";
ugm.group_id=secgrps.group_id AND (secgrps.grouptype=1 OR secgrps.grouptype=3)";
}
$sql .= $self->getCriteriaSql();
@ -477,7 +477,7 @@ $sql .= " WHERE
if ($trusted) {
$sql .= " AND tr.user_id=u.user_id AND u.user_id=ugm.user_id AND
ugm.group_id=sd.group_id AND (secgrps.grouptype=1 OR secgrps.grouptype=3)";
ugm.group_id=secgrps.group_id AND (secgrps.grouptype=1 OR secgrps.grouptype=3)";
}
$sql .= $self->getCriteriaSql();

2
mozilla/webtools/litmus/Litmus/DB/Testcase.pm
View File

@ -233,7 +233,7 @@ sub coverage() {
}
if ($trusted) {
$from .= ", user_group_map ugm, security_groups sg";
$where .= " AND tr.user_id=u.user_id AND u.user_id=ugm.user_id AND ugm.group_id=sd.group_id AND (sg.grouptype=1 OR sg.grouptype=3)";
$where .= " AND tr.user_id=u.user_id AND u.user_id=ugm.user_id AND ugm.group_id=sg.group_id AND (sg.grouptype=1 OR sg.grouptype=3)";
}
my $sql = $select . $from . $where . $order_by;
#print $sql,"<br/>\n";

4
mozilla/webtools/litmus/Litmus/DB/Testresult.pm
View File

@ -133,8 +133,8 @@ Litmus::DB::Testresult->set_sql(CompletedByTrusted => qq{
tr.opsys_id=? AND
tr.user_id=u.user_id AND
AND tr.user_id=u.user_id AND u.user_id=ugm.user_id AND
ugm.group_id=sd.group_id AND
(sd.grouptype=1 OR sd.grouptype=3)
ugm.group_id=sg.group_id AND
(sg.grouptype=1 OR sg.grouptype=3)
ORDER BY tr.submission_time DESC
});