From a37c5ae961366e3d693991b51d0830d40ae37e08 Mon Sep 17 00:00:00 2001 From: miloops Date: Thu, 11 Sep 2008 17:41:55 -0300 Subject: Improve test coverage when using the group option in find, has_many or has_and_belongs_to_many. Signed-off-by: Michael Koziarski --- activerecord/test/models/company.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'activerecord/test/models/company.rb') diff --git a/activerecord/test/models/company.rb b/activerecord/test/models/company.rb index cd435948a1..1abf3f3918 100644 --- a/activerecord/test/models/company.rb +++ b/activerecord/test/models/company.rb @@ -55,6 +55,8 @@ class Firm < Company has_many :readonly_clients, :class_name => 'Client', :readonly => true has_many :clients_using_primary_key, :class_name => 'Client', :primary_key => 'name', :foreign_key => 'firm_name' + has_many :clients_grouped_by_firm_id, :class_name => "Client", :group => "firm_id" + has_many :clients_grouped_by_name, :class_name => "Client", :group => "name" has_one :account, :foreign_key => "firm_id", :dependent => :destroy, :validate => true has_one :unvalidated_account, :foreign_key => "firm_id", :class_name => 'Account', :validate => false -- cgit v1.2.3 From 646b5bfa61f8e803d98bd1557c53ea961cc6b16d Mon Sep 17 00:00:00 2001 From: miloops Date: Thu, 11 Sep 2008 19:14:06 -0300 Subject: Use select and change test so new tests can work on postgres. Signed-off-by: Michael Koziarski --- activerecord/test/models/company.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'activerecord/test/models/company.rb') diff --git a/activerecord/test/models/company.rb b/activerecord/test/models/company.rb index 1abf3f3918..0eb8ae0a15 100644 --- a/activerecord/test/models/company.rb +++ b/activerecord/test/models/company.rb @@ -55,8 +55,8 @@ class Firm < Company has_many :readonly_clients, :class_name => 'Client', :readonly => true has_many :clients_using_primary_key, :class_name => 'Client', :primary_key => 'name', :foreign_key => 'firm_name' - has_many :clients_grouped_by_firm_id, :class_name => "Client", :group => "firm_id" - has_many :clients_grouped_by_name, :class_name => "Client", :group => "name" + has_many :clients_grouped_by_firm_id, :class_name => "Client", :group => "firm_id", :select => "firm_id" + has_many :clients_grouped_by_name, :class_name => "Client", :group => "name", :select => "name" has_one :account, :foreign_key => "firm_id", :dependent => :destroy, :validate => true has_one :unvalidated_account, :foreign_key => "firm_id", :class_name => 'Account', :validate => false -- cgit v1.2.3