From 263182bed7331a64d0abebceecabb191149d9908 Mon Sep 17 00:00:00 2001 From: "ccooper%deadsquid.com" Date: Mon, 21 Jan 2008 16:10:10 +0000 Subject: [PATCH] - check for subgroup array length when building SQL git-svn-id: svn://10.0.0.236/trunk@243664 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/webtools/litmus/Litmus/TestEvent.pm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mozilla/webtools/litmus/Litmus/TestEvent.pm b/mozilla/webtools/litmus/Litmus/TestEvent.pm index 74983214905..258e3b30a54 100755 --- a/mozilla/webtools/litmus/Litmus/TestEvent.pm +++ b/mozilla/webtools/litmus/Litmus/TestEvent.pm @@ -127,7 +127,7 @@ sub getBreakdownByLocale { if ($self->{_testgroup_id}) { $locale_sql_from .= ", testcase_subgroups tsg, subgroup_testgroups sgtg"; $locale_sql_where .= " AND tr.testcase_id=tsg.testcase_id AND tsg.subgroup_id=sgtg.subgroup_id AND sgtg.testgroup_id=".$self->{_testgroup_id}; - if ($self->{_subgroups}) { + if ($self->{_subgroups} and scalar @{$self->{_subgroups}}) { $locale_sql_where .= " AND tsg.subgroup_id IN ("; for (my $i=0; $i<=$#{$self->{_subgroups}}; $i++) { if ($i>0) { @@ -187,7 +187,7 @@ sub getBreakdownByPlatform { if ($self->{_testgroup_id}) { $platform_sql_from .= ", testcase_subgroups tsg, subgroup_testgroups sgtg"; $platform_sql_where .= " AND tr.testcase_id=tsg.testcase_id AND tsg.subgroup_id=sgtg.subgroup_id AND sgtg.testgroup_id=$self->{_testgroup_id}"; - if ($self->{_subgroups}) { + if ($self->{_subgroups} and scalar @{$self->{_subgroups}}) { $platform_sql_where .= " AND tsg.subgroup_id IN ("; for (my $i=0; $i<=$#{$self->{_subgroups}}; $i++) { if ($i>0) { @@ -248,7 +248,7 @@ sub getBreakdownByResultStatus { if ($self->{_testgroup_id}) { $status_sql_from .= ", testcase_subgroups tsg, subgroup_testgroups sgtg"; $status_sql_where .= " AND tr.testcase_id=tsg.testcase_id AND tsg.subgroup_id=sgtg.subgroup_id AND sgtg.testgroup_id=" . $self->{_testgroup_id}; - if ($self->{_subgroups}) { + if ($self->{_subgroups} and scalar @{$self->{_subgroups}}) { $status_sql_where .= " AND tsg.subgroup_id IN ("; for (my $i=0; $i<=$#{$self->{_subgroups}}; $i++) { if ($i>0) { @@ -307,7 +307,7 @@ sub getBreakdownBySubgroup { if ($self->{_testgroup_id}) { $subgroup_sql_where .= " AND tg.testgroup_id=" . $self->{_testgroup_id}; - if ($self->{_subgroups}) { + if ($self->{_subgroups} and scalar @{$self->{_subgroups}}) { $subgroup_sql_where .= " AND tsg.subgroup_id IN ("; for (my $i=0; $i<=$#{$self->{_subgroups}}; $i++) { if ($i>0) { @@ -378,7 +378,7 @@ sub getBreakdownByUser { if ($self->{_testgroup_id}) { $user_sql_from .= ", testcase_subgroups tsg, subgroup_testgroups sgtg"; $user_sql_where .= " AND tr.testcase_id=tsg.testcase_id AND tsg.subgroup_id=sgtg.subgroup_id AND sgtg.testgroup_id=" . $self->{_testgroup_id}; - if ($self->{_subgroups}) { + if ($self->{_subgroups} and scalar @{$self->{_subgroups}}) { $user_sql_where .= " AND tsg.subgroup_id IN ("; for (my $i=0; $i<=$#{$self->{_subgroups}}; $i++) { if ($i>0) { @@ -439,7 +439,7 @@ sub getBreakdownByUserAndResultStatus { if ($self->{_testgroup_id}) { $tester_sql_from .= ", testcase_subgroups tsg, subgroup_testgroups sgtg"; $tester_sql_where .= " AND tr.testcase_id=tsg.testcase_id AND tsg.subgroup_id=sgtg.subgroup_id AND sgtg.testgroup_id=$self->{_testgroup_id}"; - if ($self->{_subgroups}) { + if ($self->{_subgroups} and scalar @{$self->{_subgroups}}) { $tester_sql_where .= " AND tsg.subgroup_id IN ("; for (my $i=0; $i<=$#{$self->{_subgroups}}; $i++) { if ($i>0) {