aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorAndrew White <pixeltrix@users.noreply.github.com>2017-02-26 22:38:18 +0000
committerGitHub <noreply@github.com>2017-02-26 22:38:18 +0000
commit945c3cd519d8f39d1a4c1e9ea25aa7eb8d975f8e (patch)
treed926d5050668704ab008efe85eb49d6f1a64216f /activerecord
parent385799a4a3a361ed2d27a5e72e884f1b7d82f096 (diff)
parent45c5e26bbc514965a2311d564fc8950e7cd31ee4 (diff)
downloadrails-945c3cd519d8f39d1a4c1e9ea25aa7eb8d975f8e.tar.gz
rails-945c3cd519d8f39d1a4c1e9ea25aa7eb8d975f8e.tar.bz2
rails-945c3cd519d8f39d1a4c1e9ea25aa7eb8d975f8e.zip
Merge pull request #28187 from kamipo/fix_intermittent_test_failure
Fix `test_apply_distinct_in_count` failure in PG adapter
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/test/cases/calculations_test.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/activerecord/test/cases/calculations_test.rb b/activerecord/test/cases/calculations_test.rb
index e70af43155..edf7ce0bca 100644
--- a/activerecord/test/cases/calculations_test.rb
+++ b/activerecord/test/cases/calculations_test.rb
@@ -234,6 +234,9 @@ class CalculationsTest < ActiveRecord::TestCase
end
queries.each do |query|
+ # `table_alias_length` in `column_alias_for` would execute
+ # "SHOW max_identifier_length" statement in PostgreSQL adapter.
+ next if query == "SHOW max_identifier_length"
assert_match %r{\ASELECT(?! DISTINCT) COUNT\(DISTINCT\b}, query
end
end