Use an `Attribute` object to represent a bind value

The column is primarily used for type casting, which we're trying to
separate from the idea of a column. Since what we really need is the
combination of a name, type, and value, let's use the object that we
already have to represent that concept, rather than this tuple. No
consumers of the bind values have been changed, only the producers
(outside of tests which care too much about internals). This is
*finally* possible since the bind values are now produced from a
reasonable number of lcoations.

1 files changed, 4 insertions, 4 deletions

diff --git a/activerecord/lib/active_record/relation/where_clause.rb b/activerecord/lib/active_record/relation/where_clause.rb
index 1a70dc447e..ae5667dfd6 100644
--- a/activerecord/lib/active_record/relation/where_clause.rb
+++ b/activerecord/lib/active_record/relation/where_clause.rb
@@ -39,7 +39,7 @@ module ActiveRecord
           end
         end
 
-        binds = self.binds.select(&:first).to_h.transform_keys(&:name)
+        binds = self.binds.map { |attr| [attr.name, attr.value] }.to_h
 
         equalities.map { |node|
           name = node.left.name
@@ -97,7 +97,7 @@ module ActiveRecord
       def non_conflicting_binds(other)
         conflicts = referenced_columns & other.referenced_columns
         conflicts.map! { |node| node.name.to_s }
-        binds.reject { |col, _| conflicts.include?(col.name) }
+        binds.reject { |attr| conflicts.include?(attr.name) }
       end
 
       def inverted_predicates
@@ -130,8 +130,8 @@ module ActiveRecord
       end
 
       def binds_except(columns)
-        binds.reject do |column, _|
-          columns.include?(column.name)
+        binds.reject do |attr|
+          columns.include?(attr.name)
         end
       end