Changeset 177 for branches

Timestamp:

04/10/09 20:01:23 (15 years ago)

Author:

nanardon

Message:

• backport fix for #28

Location:

branches/1

Files:

• . (modified) (1 prop)
• lib/Vote/Model/Vote.pm (modified) (2 diffs)

branches/1/lib/Vote/Model/Vote.pm

@@ -593 +593 @@
     my $sth = $self->db->prepare(
         q{
-        select count(ballot.id), value from ballot left join ballot_item
-        on ballot.id = ballot_item.id where ballot.poll = ? and invalid = 'false'
+        select count(ballot.id), value from 
+        (select ballot.id, coalesce(corrected, value) as "value" from ballot left join ballot_item
+        on ballot.id = ballot_item.id where ballot.poll = ? and (invalid = 'false'or invalid is null)
+        group by ballot.id, coalesce(corrected, value)) as ballot
         group by value
-        order by count
+        order by count desc, value
         }
     );
@@ -612 +614 @@
     my $sth = $self->db->prepare(
         q{
-        select count(ballot.id), coalesce(corrected, value) as value
-        from ballot join ballot_item
-        on ballot.id = ballot_item.id where ballot.poll = ? and
-        (invalid = 'false' or invalid is null)
-        group by coalesce(corrected, value)
-        order by count desc
+        select count(ballot.id), value from 
+        (select ballot.id, coalesce(corrected, value) as "value" from ballot join ballot_item
+        on ballot.id = ballot_item.id where ballot.poll = ? and (invalid = 'false'or invalid is null)
+        group by ballot.id, coalesce(corrected, value)) as ballot
+        group by value
+        order by count desc, value
         }
     );