querybuilder 0.5.3 → 0.5.4

data/History.txt

@@ -1,3 +1,8 @@
+== 0.5.4 2009-04-09
+
+* 1 minor enhancement:
+  * Fixed a bug counting records wrong with multiple group fields
+
 == 0.5.3 2009-04-08
 
 * 1 minor enhancement:

data/lib/QueryBuilder.rb

@@ -10,7 +10,7 @@ Syntax of a query is "RELATION [where ...|] [in ...|from SUB_QUERY|]".
 =end
 class QueryBuilder
   attr_reader :tables, :where, :errors, :join_tables, :distinct, :final_parser, :page_size
-  VERSION = '0.5.3'
+  VERSION = '0.5.4'
   
   @@main_table = {}
   @@main_class = {}
@@ -653,7 +653,8 @@ class QueryBuilder
 
       if @group =~ /GROUP\s+BY\s+(.+)/
         # we need to COALESCE in order to count groups where $1 is NULL.
-        count_on = "COUNT(DISTINCT COALESCE(#{$1},0))"
+        fields = $1.split(",").map{|f| "COALESCE(#{f.strip},0)"}.join(",")
+        count_on = "COUNT(DISTINCT #{fields})"
       elsif @distinct
         count_on = "COUNT(DISTINCT #{table}.id)"
       else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: querybuilder
 version: !ruby/object:Gem::Version 
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors: 
 - Gaspard Bucher
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-08 00:00:00 +02:00
+date: 2009-04-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency