aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/relations_test.rb
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2019-06-18 00:02:11 +0900
committerGitHub <noreply@github.com>2019-06-18 00:02:11 +0900
commitc104bfe424e6cebe9c8e85a38515327a6c88b1f8 (patch)
treeea35f99ba81e22ff028c047d65907fdbc0122ab2 /activerecord/test/cases/relations_test.rb
parentb6068e6c42a070843b0a3844dc72c2a98ec3c6eb (diff)
parentcb0299c9eba6463085130debda6347abf9683463 (diff)
downloadrails-c104bfe424e6cebe9c8e85a38515327a6c88b1f8.tar.gz
rails-c104bfe424e6cebe9c8e85a38515327a6c88b1f8.tar.bz2
rails-c104bfe424e6cebe9c8e85a38515327a6c88b1f8.zip
Merge pull request #36506 from kamipo/group_by_with_order_by_virtual_count_attribute
PostgreSQL: Fix GROUP BY with ORDER BY virtual count attribute
Diffstat (limited to 'activerecord/test/cases/relations_test.rb')
-rw-r--r--activerecord/test/cases/relations_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index a5c162af33..5df1e3ccf9 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -1955,8 +1955,8 @@ class RelationTest < ActiveRecord::TestCase
test "joins with order by custom attribute" do
companies = Company.create!([{ name: "test1" }, { name: "test2" }])
companies.each { |company| company.contracts.create! }
- assert_equal companies, Company.joins(:contracts).order(:metadata)
- assert_equal companies.reverse, Company.joins(:contracts).order(metadata: :desc)
+ assert_equal companies, Company.joins(:contracts).order(:metadata, :count)
+ assert_equal companies.reverse, Company.joins(:contracts).order(metadata: :desc, count: :desc)
end
test "delegations do not leak to other classes" do