Changeset 9019

Timestamp:

03/13/08 03:12:23 (4 months ago)

Author:

rick

Message:

port [9018] to 2.0 stable

Files:

• branches/2-0-stable/activerecord/CHANGELOG (modified) (1 diff)
• branches/2-0-stable/activerecord/lib/active_record/calculations.rb (modified) (1 diff)
• branches/2-0-stable/activerecord/test/associations/join_model_test.rb (modified) (1 diff)

branches/2-0-stable/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Ensure that ActiveRecord::Calculations disambiguates field names with the table name.  #11027 [cavalle]
-
-* Ensure that modifying has_and_belongs_to_many actions clear the query cache.  Closes #10840 [john.andrews]

branches/2-0-stable/activerecord/lib/active_record/calculations.rb

@@ -156 +156 @@
-          merged_includes = merge_includes(scope ? scope[:include] : [], options[:include])
-          aggregate_alias = column_alias_for(operation, column_name)
+          column_name     = "#{connection.quote_table_name(table_name)}.#{column_name}" unless column_name == "*" || column_name.to_s.include?('.')
-
-          if operation == 'count'

branches/2-0-stable/activerecord/test/associations/join_model_test.rb

@@ -537 +537 @@
-  end
-
+  def test_calculations_on_has_many_through_should_disambiguate_fields
+    assert_nothing_raised { authors(:david).categories.maximum(:id) }
+  end
+  
+  def test_calculations_on_has_many_through_should_not_disambiguate_fields_unless_necessary
+    assert_nothing_raised { authors(:david).categories.maximum("categories.id") }
+  end
+
-  def test_has_many_through_has_many_with_sti
-    assert_equal [comments(:does_it_hurt)], authors(:david).special_post_comments