Skip to content

Commit 84432b4

Browse files
committed
[Rails3] Fix #limited_update_conditions in arel compiler. Few more notes.
1 parent 6db735d commit 84432b4

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

RAILS3_NOTES

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
- Undefined coerced test: EagerAssociationTest#test_count_with_include
4242
- Undefined coerced test: AttributeMethodsTest#test_typecast_attribute_from_select_to_false
4343
- Undefined coerced test: AttributeMethodsTest#test_typecast_attribute_from_select_to_true
44-
- Undefined coerced test: BasicsTest#test_read_attributes_before_type_cast_on_datetime
44+
Undefined coerced test: BasicsTest#test_read_attributes_before_type_cast_on_datetime
4545
- Undefined coerced test: CalculationsTest#test_should_sum_expression
4646
- Undefined coerced test: InheritanceTest#test_a_bad_type_column
4747
- Undefined coerced test: InheritanceTest#test_eager_load_belongs_to_primary_key_quoting
@@ -56,6 +56,13 @@
5656

5757

5858

59+
= Rails Todo
60+
61+
Patch duplicate quote_table_name in:
62+
/Users/kencollins/Repositories/rails/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb:96
63+
64+
65+
5966
= Arel Todo
6067

6168
338 examples, 0 failures, 3 pending

lib/arel/engines/sql/compilers/sqlserver_compiler.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def rowtable_order_clauses
9595
end
9696

9797
def limited_update_conditions(conditions,taken)
98-
quoted_primary_key = engine.quote_column_name(relation.primary_key)
98+
quoted_primary_key = engine.connection.quote_column_name(relation.primary_key)
9999
conditions = " #{conditions}".strip
100100
build_query \
101101
"WHERE #{quoted_primary_key} IN",

0 commit comments

Comments
 (0)