mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
213796fb49
A common source of bugs and code bloat within Active Record has been the need for us to maintain the list of bind values separately from the AST they're associated with. This makes any sort of AST manipulation incredibly difficult, as any time we want to potentially insert or remove an AST node, we need to traverse the entire tree to find where the associated bind parameters are. With this change, the bind parameters now live on the AST directly. Active Record does not need to know or care about them until the final AST traversal for SQL construction. Rather than returning just the SQL, the Arel collector will now return both the SQL and the bind parameters. At this point the connection adapter will have all the values that it had before. A bit of this code is janky and something I'd like to refactor later. In particular, I don't like how we're handling associations in the predicate builder, the special casing of `StatementCache::Substitute` in `QueryAttribute`, or generally how we're handling bind value replacement in the statement cache when prepared statements are disabled. This also mostly reverts #26378, as it moved all the code into a location that I wanted to delete. /cc @metaskills @yahonda, this change will affect the adapters Fixes #29766. Fixes #29804. Fixes #26541. Close #28539. Close #24769. Close #26468. Close #26202. There are probably other issues/PRs that can be closed because of this commit, but that's all I could find on the first few pages.
108 lines
2.9 KiB
Ruby
108 lines
2.9 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require "cases/helper"
|
|
require "models/topic"
|
|
require "models/author"
|
|
require "models/post"
|
|
|
|
if ActiveRecord::Base.connection.prepared_statements
|
|
module ActiveRecord
|
|
class BindParameterTest < ActiveRecord::TestCase
|
|
fixtures :topics, :authors, :author_addresses, :posts
|
|
|
|
class LogListener
|
|
attr_accessor :calls
|
|
|
|
def initialize
|
|
@calls = []
|
|
end
|
|
|
|
def call(*args)
|
|
calls << args
|
|
end
|
|
end
|
|
|
|
def setup
|
|
super
|
|
@connection = ActiveRecord::Base.connection
|
|
@subscriber = LogListener.new
|
|
@pk = Topic.columns_hash[Topic.primary_key]
|
|
@subscription = ActiveSupport::Notifications.subscribe("sql.active_record", @subscriber)
|
|
end
|
|
|
|
def teardown
|
|
ActiveSupport::Notifications.unsubscribe(@subscription)
|
|
end
|
|
|
|
def test_bind_from_join_in_subquery
|
|
subquery = Author.joins(:thinking_posts).where(name: "David")
|
|
scope = Author.from(subquery, "authors").where(id: 1)
|
|
assert_equal 1, scope.count
|
|
end
|
|
|
|
def test_binds_are_logged
|
|
sub = Arel::Nodes::BindParam.new(1)
|
|
binds = [Relation::QueryAttribute.new("id", 1, Type::Value.new)]
|
|
sql = "select * from topics where id = #{sub.to_sql}"
|
|
|
|
@connection.exec_query(sql, "SQL", binds)
|
|
|
|
message = @subscriber.calls.find { |args| args[4][:sql] == sql }
|
|
assert_equal binds, message[4][:binds]
|
|
end
|
|
|
|
def test_find_one_uses_binds
|
|
Topic.find(1)
|
|
message = @subscriber.calls.find { |args| args[4][:binds].any? { |attr| attr.value == 1 } }
|
|
assert message, "expected a message with binds"
|
|
end
|
|
|
|
def test_logs_binds_after_type_cast
|
|
binds = [Relation::QueryAttribute.new("id", "10", Type::Integer.new)]
|
|
assert_logs_binds(binds)
|
|
end
|
|
|
|
def test_logs_legacy_binds_after_type_cast
|
|
binds = [[@pk, "10"]]
|
|
assert_logs_binds(binds)
|
|
end
|
|
|
|
def test_deprecate_supports_statement_cache
|
|
assert_deprecated { ActiveRecord::Base.connection.supports_statement_cache? }
|
|
end
|
|
|
|
private
|
|
def assert_logs_binds(binds)
|
|
payload = {
|
|
name: "SQL",
|
|
sql: "select * from topics where id = ?",
|
|
binds: binds,
|
|
type_casted_binds: @connection.type_casted_binds(binds)
|
|
}
|
|
|
|
event = ActiveSupport::Notifications::Event.new(
|
|
"foo",
|
|
Time.now,
|
|
Time.now,
|
|
123,
|
|
payload)
|
|
|
|
logger = Class.new(ActiveRecord::LogSubscriber) {
|
|
attr_reader :debugs
|
|
|
|
def initialize
|
|
super
|
|
@debugs = []
|
|
end
|
|
|
|
def debug(str)
|
|
@debugs << str
|
|
end
|
|
}.new
|
|
|
|
logger.sql(event)
|
|
assert_match([[@pk.name, 10]].inspect, logger.debugs.first)
|
|
end
|
|
end
|
|
end
|
|
end
|