rails/activerecord/test
Sean Griffin 5d41cb3bfd Change WhereClause#merge to same named columns on diff tables
While the predicates are an arel equality node where the left side is a
full arel attribute, the binds just have the name of the column and
nothing else. This means that while splitting the predicates can include
the table as a factor, the binds cannot. It's entirely possible that we
might be able to have the bind params carry a bit more information (I
don't believe the name is used for anything but logging), and that is
probably a worthwhile change to make in the future.

However the simplest (and likely slightly faster) solution is to simply
use the indices of the conflicts in both cases. This means that we only
have to compute the collision space once, instead of twice even though
we're doing an additional array iteration. Regardless, this method isn't
a performance hotspot.

Close #22823.

[Ben Woosley & Sean Griffin]
2016-01-12 14:38:25 -07:00
..
active_record/connection_adapters introduce conn.data_source_exists? and conn.data_sources. 2015-09-22 19:48:44 +02:00
assets
cases Change WhereClause#merge to same named columns on diff tables 2016-01-12 14:38:25 -07:00
fixtures Fix test_find_with_order_on_included_associations_with_construct_finder_sql_for_association_limiting_and_is_distinct to NULL-agnostic way 2015-12-19 17:38:42 +09:00
migrations Internal test migrations use the private 'Current' version 2015-12-15 17:18:09 +10:30
models Skip the STI condition when evaluating a default scope 2016-01-12 05:43:58 +10:30
schema Add conditional_token to users. 2016-01-09 22:31:13 +01:00
support Deprecate #table_exists?, #tables and passing arguments to #talbes 2015-11-09 23:13:23 +09:00
.gitignore
config.example.yml Remove legacy mysql adapter 2015-12-17 15:54:57 +00:00
config.rb