Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions lib/cancan/model_adapters/active_record_5_adapter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,22 @@ def sanitize_sql_activerecord5(conditions)
def visit_nodes(node)
# Rails 5.2 adds a BindParam node that prevents the visitor method from properly compiling the SQL query
if self.class.version_greater_or_equal?('5.2.0')
connection = @model_class.send(:connection)
connection = model_connection
collector = Arel::Collectors::SubstituteBinds.new(connection, Arel::Collectors::SQLString.new)
connection.visitor.accept(node, collector).value
else
@model_class.send(:connection).visitor.compile(node)
model_connection.visitor.compile(node)
end
end

# Rails 7.2 soft-deprecated ActiveRecord::Base.connection in favour of
# lease_connection, which better describes its lifecycle. Fall back to
# connection for Rails < 7.2 where lease_connection is not defined.
def model_connection
if @model_class.respond_to?(:lease_connection)
@model_class.lease_connection
else
@model_class.send(:connection)
end
end
end
Expand Down