Skip to content

Commit a51dd76

Browse files
committed
Added comment about add_joins! raising a nil error if passed options[:joins]
in 2.1.1 or other non-edge rails.
1 parent 0d6c094 commit a51dd76

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

lib/active_record/connection_adapters/sqlserver_adapter.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ def self.construct_finder_sql(options)
7272

7373
add_lock!(sql, options, scope) if ActiveRecord::Base.connection.adapter_name == "SQLServer" && !options[:lock].blank? # SQLServer
7474

75+
# The next line may fail with a nil error under 2.1.1 or other non-edge rails versions - Use this instead: add_joins!(sql, options, scope)
7576
add_joins!(sql, options[:joins], scope)
7677
add_conditions!(sql, options[:conditions], scope)
7778

0 commit comments

Comments
 (0)