@@ -30,14 +30,12 @@ module DataMapper def aggregate_read_statement(aggregate_function, property, query) statement = "SELECT #{aggregate_field_statement(query.repository, aggregate_function, property, query.links.any?)}" + statement << ", #{fields_statement(query)}" unless query.fields.empty? statement << " FROM #{quote_table_name(query.model.storage_name(query.repository.name))}" statement << links_statement(query) if query.links.any? statement << " WHERE #{conditions_statement(query)}" if query.conditions.any? - - # TODO: when GROUP BY support added, uncomment this, and (by default) have - # it sort on the non-aggregate fields being SELECTed - #statement << " ORDER BY #{order_statement(query)}" if query.order.any? - + statement << " GROUP BY #{fields_statement(query)}" if query.unique? + statement << " ORDER BY #{order_statement(query)}" if query.order.any? statement << " LIMIT #{quote_column_value(query.limit)}" if query.limit statement << " OFFSET #{quote_column_value(query.offset)}" if query.offset && query.offset > 0 statement dm-aggregates/lib/dm-aggregates/adapters/data_objects_adapter.rb @@ -5,7 +5,17 @@ module DataMapper private def with_repository_and_property(*args, &block) - query = args.last.respond_to?(:merge) ? args.pop : {} + query = args.last.respond_to?(:merge) ? args.pop : {} + + if query.kind_of?(Hash) + if query.has_key?(:fields) && query[:fields].any? + query[:unique] = true + query[:order] ||= query[:fields] + else + query[:fields] = [] + end + end + property_name = args.first query = scoped_query(query) dm-aggregates/lib/dm-aggregates/collection.rb @@ -21,7 +21,7 @@ module DataMapper # @public def count(*args) with_repository_and_property(*args) do |repository,property,query| - repository.count(property, query.merge(:limit => 1)) + repository.count(property, query) end end @@ -42,7 +42,7 @@ module DataMapper def min(*args) with_repository_and_property(*args) do |repository,property,query| check_property_is_number(property) - repository.min(property, query.merge(:limit => 1)) + repository.min(property, query) end end @@ -63,7 +63,7 @@ module DataMapper def max(*args) with_repository_and_property(*args) do |repository,property,query| check_property_is_number(property) - repository.max(property, query.merge(:limit => 1)) + repository.max(property, query) end end @@ -84,7 +84,7 @@ module DataMapper def avg(*args) with_repository_and_property(*args) do |repository,property,query| check_property_is_number(property) - repository.avg(property, query.merge(:limit => 1)) + repository.avg(property, query) end end @@ -105,7 +105,7 @@ module DataMapper def sum(*args) with_repository_and_property(*args) do |repository,property,query| check_property_is_number(property) - repository.sum(property, query.merge(:limit => 1)) + repository.sum(property, query) end end dm-aggregates/lib/dm-aggregates/functions.rb @@ -5,7 +5,17 @@ module DataMapper private def with_repository_and_property(*args, &block) - query = args.last.respond_to?(:merge) ? args.pop : {} + query = args.last.respond_to?(:merge) ? args.pop : {} + + if query.kind_of?(Hash) + if query.has_key?(:fields) && query[:fields].any? + query[:unique] = true + query[:order] ||= query[:fields] + else + query[:fields] = [] + end + end + property_name = args.first query = scoped_query(query) dm-aggregates/lib/dm-aggregates/model.rb c09b86be3b5329ea55edabb396b3806f07531da1 Dan Kubb dan.kubb@autopilotmarketing.com http://github.com/sam/dm-more/commit/c366fee263c578c2363b2242d61b935d8b556094 c366fee263c578c2363b2242d61b935d8b556094 2008-07-14T22:49:32-07:00 2008-07-14T22:49:32-07:00 Initial addition of GROUP BY support f4b9c5e1c042ee417fead86bf3bf735c654e2808 Dan Kubb dan.kubb@autopilotmarketing.com