aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2013-06-09 06:02:56 -0700
committerJon Leighton <j@jonathanleighton.com>2013-06-09 06:02:56 -0700
commitf5e133e830940731b74c4e12118eab90054d32ec (patch)
tree73f6e84f6cf2cdfa40e9a91da09432404c0ccb7f /activerecord/test
parentae6e6d953084d1966e52cc06ffe24131f0115cc1 (diff)
parentda9b5d4a8435b744fcf278fffd6d7f1e36d4a4f2 (diff)
downloadrails-f5e133e830940731b74c4e12118eab90054d32ec.tar.gz
rails-f5e133e830940731b74c4e12118eab90054d32ec.tar.bz2
rails-f5e133e830940731b74c4e12118eab90054d32ec.zip
Merge pull request #10710 from senny/5554_let_the_database_raise_on_counts
Remove column restrictions for `#count`, let the database raise if the SQL is invalid.
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/cases/calculations_test.rb9
1 files changed, 9 insertions, 0 deletions
diff --git a/activerecord/test/cases/calculations_test.rb b/activerecord/test/cases/calculations_test.rb
index c8ac77984f..0f3f9aecfc 100644
--- a/activerecord/test/cases/calculations_test.rb
+++ b/activerecord/test/cases/calculations_test.rb
@@ -167,6 +167,15 @@ class CalculationsTest < ActiveRecord::TestCase
assert_no_match(/OFFSET/, queries.first)
end
+ def test_count_on_invalid_columns_raises
+ e = assert_raises(ActiveRecord::StatementInvalid) {
+ Account.select("credit_limit, firm_name").count
+ }
+
+ assert_match "accounts", e.message
+ assert_match "credit_limit, firm_name", e.message
+ end
+
def test_should_group_by_summed_field_having_condition
c = Account.group(:firm_id).having('sum(credit_limit) > 50').sum(:credit_limit)
assert_nil c[1]