index
:
rails.git
3-2-stable-for-hmno
master
Mirror of official rails repo with custom fixes.
Harald Eilertsen
about
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
activerecord
/
test
/
cases
/
relation
/
merging_test.rb
Commit message (
Expand
)
Author
Age
Files
Lines
*
Bugfix ActiveRecord::Relation#merge special case of from clause
Bogdan Gusiev
2018-09-28
1
-0
/
+4
*
Fix merging relation that order including `?`
Ryuta Kamizono
2018-08-21
1
-0
/
+10
*
Fix relation merging with skip_query_cache!
James Williams
2018-04-19
1
-0
/
+4
*
Use assert_empty and assert_not_empty
Daniel Colson
2018-01-25
1
-2
/
+2
*
Use assert_predicate and assert_not_predicate
Daniel Colson
2018-01-25
1
-3
/
+3
*
Change refute to assert_not
Daniel Colson
2018-01-25
1
-1
/
+1
*
Fix relation merger issue with `left_outer_joins`
Mehmet Emin INAC
2018-01-15
1
-0
/
+6
*
Refactor Active Record to let Arel manage bind params
Sean Griffin
2017-07-24
1
-4
/
+2
*
Use frozen-string-literal in ActiveRecord
Kir Shatrov
2017-07-19
1
-0
/
+2
*
Revert "Merge pull request #29540 from kirs/rubocop-frozen-string"
Matthew Draper
2017-07-02
1
-1
/
+0
*
Enforce frozen string in Rubocop
Kir Shatrov
2017-07-01
1
-0
/
+1
*
Remove unused defined association
Ryuta Kamizono
2017-06-11
1
-1
/
+1
*
Delegate `ast` and `locked` to `arel` explicitly
Ryuta Kamizono
2017-05-06
1
-1
/
+1
*
Restore `fixtures :author_addresses`
Ryuta Kamizono
2017-04-27
1
-2
/
+2
*
Revert "Merge pull request #27636 from mtsmfm/disable-referential-integrity-w...
Rafael Mendonça França
2017-04-26
1
-2
/
+2
*
Replace \Z to \z
Ryuta Kamizono
2017-04-24
1
-1
/
+1
*
Use `SET CONSTRAINTS` for `disable_referential_integrity` without superuser p...
Fumiaki MATSUSHIMA
2017-03-26
1
-2
/
+2
*
Revert "Merge pull request #21233 from mtsmfm/disable-referential-integrity-w...
Rafael Mendonça França
2017-01-03
1
-2
/
+2
*
Use `SET CONSTRAINTS` for `disable_referential_integrity` without superuser p...
Fumiaki MATSUSHIMA
2016-12-03
1
-2
/
+2
*
improve error message when include assertions fail
Michael Grosser
2016-09-16
1
-3
/
+3
*
modernizes hash syntax in activerecord
Xavier Noria
2016-08-06
1
-3
/
+3
*
applies new string literal convention in activerecord/test
Xavier Noria
2016-08-06
1
-17
/
+17
*
Properly include the `from` clause when merging relations
Sean Griffin
2016-01-14
1
-0
/
+7
*
Remove Relation#bind_params
Sean Griffin
2015-01-27
1
-2
/
+2
*
Use an `Attribute` object to represent a bind value
Sean Griffin
2015-01-27
1
-11
/
+0
*
Remove all cases of manuallly wrapping `Arel::Nodes::Quoted`
Sean Griffin
2014-12-29
1
-2
/
+2
*
Inform Arel we don't need additional type casting in tests
Sean Griffin
2014-12-26
1
-2
/
+2
*
Build fix when running in isolation
Arun Agrawal
2014-11-14
1
-0
/
+1
*
Load :developers fixtures where expecting a Developer to be there
Akira Matsuda
2014-09-05
1
-1
/
+1
*
"warning: assigned but unused variable"
Akira Matsuda
2014-08-21
1
-1
/
+1
*
Only merge scopes with zero arity in has_many through
Agis-
2014-08-20
1
-0
/
+13
*
Merge pull request #15078 from nbudin/fix_merger_filter_binds_comparison_master
Rafael Mendonça França
2014-05-14
1
-0
/
+5
|
\
|
*
Make filter_binds filter out symbols that are equal to strings
Nat Budin
2014-05-14
1
-0
/
+5
|
/
*
Modify assert conditions not to be affected
Yasuo Honda
2014-05-12
1
-2
/
+3
*
remove the bind substitution visitor. to_sql should never return bind values
Aaron Patterson
2014-04-09
1
-3
/
+1
*
Merge branch 'master' into set_binds
Aaron Patterson
2014-01-14
1
-2
/
+2
|
\
*
|
where uses bind values so we don't need to manually create them
Aaron Patterson
2014-01-14
1
-11
/
+3
*
|
remove test that does not apply anymore
Aaron Patterson
2014-01-14
1
-12
/
+1
|
/
*
use arel nodes to represent non-string `order_values`.
Yves Senn
2013-11-19
1
-0
/
+12
*
Address test_merging_where_relations failure by adding `order("posts.id")`
Yasuo Honda
2013-11-18
1
-1
/
+1
*
fix weird Emacs auto indentation. [ci skip]
Yves Senn
2013-11-13
1
-8
/
+8
*
tests for merging Relations of different classes.
Yves Senn
2013-11-13
1
-0
/
+19
*
move Relation#merge tests into separate file.
Yves Senn
2013-11-13
1
-0
/
+131