Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Escape table names during calculation queries. [wesley.moxam, Koz] Cl…

…oses #4593

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8061 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 8f74527282680faacb68c3d88af7c2462b95365b 1 parent 3c9cd19
@NZKoz NZKoz authored
View
4 activerecord/lib/active_record/calculations.rb
@@ -167,7 +167,7 @@ def construct_calculation_sql(operation, column_name, options) #:nodoc:
if operation == 'count'
if merged_includes.any?
options[:distinct] = true
- column_name = options[:select] || [table_name, primary_key] * '.'
+ column_name = options[:select] || [connection.quote_table_name(table_name), primary_key] * '.'
end
if options[:distinct]
@@ -182,7 +182,7 @@ def construct_calculation_sql(operation, column_name, options) #:nodoc:
sql << ", #{options[:group_field]} AS #{options[:group_alias]}" if options[:group]
sql << " FROM (SELECT DISTINCT #{column_name}" if use_workaround
- sql << " FROM #{table_name} "
+ sql << " FROM #{connection.quote_table_name(table_name)} "
if merged_includes.any?
join_dependency = ActiveRecord::Associations::ClassMethods::JoinDependency.new(self, merged_includes, options[:joins], options[:ar_joins])
sql << join_dependency.join_associations.collect{|join| join.association_join }.join
View
5 activerecord/test/reserved_word_test_mysql.rb
@@ -141,6 +141,11 @@ def test_activerecord_introspection
assert_nothing_raised { Group.table_exists? }
assert_nothing_raised { Group.columns }
end
+
+ # Calculations
+ def test_calculations_work_with_reserved_words
+ assert_nothing_raised { Group.count }
+ end
#the following functions were added to DRY test cases
Please sign in to comment.
Something went wrong with that request. Please try again.