Permalink
Browse files

Merge pull request #10710 from senny/5554_let_the_database_raise_on_c…

…ounts

Remove column restrictions for `#count`, let the database raise if the SQL is invalid.
Conflicts:
	activerecord/CHANGELOG.md
  • Loading branch information...
jonleighton committed Jun 9, 2013
1 parent 214e377 commit 433e75fa0a0466ad26c3f05d61831341e20f66e6
View
@@ -1,5 +1,21 @@
## unreleased ##
+* Remove column restrictions for `count`, let the database raise if the SQL is
+ invalid. The previos behavior was untested and surprising for the user.
+ Fixes #5554.
+
+ Example:
+
+ User.select("name, username").count
+ # Before => SELECT count(*) FROM users
+ # After => ActiveRecord::StatementInvalid
+
+ # you can still use `count(:all)` to perform a query unrelated to the
+ # selected columns
+ User.select("name, username").count(:all) # => SELECT count(*) FROM users
+
+ *Yves Senn*
+
* Fix `add_column` with `array` option when using PostgreSQL. Fixes #10432
* Do not overwrite manually built records during one-to-one nested attribute assignment
@@ -234,7 +234,7 @@ def size
def empty?
return @records.empty? if loaded?
- c = count
+ c = count(:all)
c.respond_to?(:zero?) ? c.zero? : c.empty?
end
@@ -207,15 +207,18 @@ def perform_calculation(operation, column_name, options = {})
end
if operation == "count"
- column_name ||= (select_for_count || :all)
+ if select_values.present?
+ column_name ||= select_values.join(", ")
+ else
+ column_name ||= :all
+ end
unless arel.ast.grep(Arel::Nodes::OuterJoin).empty?
distinct = true
end
column_name = primary_key if column_name == :all && distinct
-
- distinct = nil if column_name =~ /\s*DISTINCT\s+/i
+ distinct = nil if column_name =~ /\s*DISTINCT[\s(]+/i
end
if group_values.any?
@@ -376,13 +379,6 @@ def type_cast_using_column(value, column)
column ? column.type_cast(value) : value
end
- def select_for_count
- if select_values.present?
- select = select_values.join(", ")
- select if select !~ /[,*]/
- end
- end
-
def build_count_subquery(relation, column_name, distinct)
column_alias = Arel.sql('count_column')
subquery_alias = Arel.sql('subquery_for_count')
@@ -162,6 +162,15 @@ def test_no_limit_no_offset
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]

0 comments on commit 433e75f

Please sign in to comment.