aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/relation
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #30169 from awortham/awortham/awortham/fix-sql-distinct-bugRafael Mendonça França2017-08-141-0/+3
|\
| * Ensure sum honors distinct on has_many throughAaron Wortham2017-08-141-0/+3
* | Completes ActiveRecord::Batches.find_each example [ci skip]Marc Rendl Ignacio2017-08-131-1/+6
|/
* Merge pull request #30126 from chopraanmol1/support_for_has_many_and_has_one_...Rafael França2017-08-111-2/+2
|\
| * Changed join_fk private method to join_foreign_key public methodchopraanmol12017-08-091-1/+1
| * Currently if relation object are passed to where condition for has one or has...chopraanmol12017-08-081-2/+2
* | Merge pull request #29720 from gaurish/ar_find_error_message_improvementRafael França2017-08-111-3/+3
|\ \ | |/ |/|
| * Return Not found Ids in ActiveRecord::NotFoundGaurish Sharma2017-07-291-3/+3
* | Merge pull request #29914 from kamipo/relation_merger_should_not_fill_empty_v...Matthew Draper2017-08-022-19/+22
|\ \
| * | `get_value` and `set_value` in `Relation` are no longer used externallyRyuta Kamizono2017-07-251-9/+10
| * | `Relation::Merger` should not fill `values` with empty valuesRyuta Kamizono2017-07-251-10/+12
* | | Edits following the reviewsMaxime Lapointe2017-07-281-6/+8
* | | Avoid duplicate clauses when using #orMaxime Lapointe2017-07-251-9/+16
| |/ |/|
* | Merge pull request #29941 from kamipo/remove_single_element_array_preprocessSean Griffin2017-07-251-1/+1
|\ \
| * | Remove single element array preprocessRyuta Kamizono2017-07-261-1/+1
* | | Allow `Relation#or` to accept a relation with different `references`Sean Griffin2017-07-251-1/+2
|/ /
* | Merge pull request #29934 from kamipo/remove_join_informationSean Griffin2017-07-251-5/+2
|\ \
| * | Remove useless `JoinInformation`Ryuta Kamizono2017-07-251-5/+2
* | | Remove unused `queries_predicates`Ryuta Kamizono2017-07-251-12/+0
|/ /
* | Merge pull request #29848 from kamipo/fix_distinct_count_with_order_and_limitRafael França2017-07-241-10/+19
|\ \ | |/ |/|
| * Should keep the table name qualified `*` for distinct subqueryRyuta Kamizono2017-07-221-1/+1
| * Fix `COUNT(DISTINCT ...)` with `ORDER BY` and `LIMIT`Ryuta Kamizono2017-07-221-10/+19
* | Fix build failures on PGSean Griffin2017-07-241-0/+4
* | Refactor Active Record to let Arel manage bind paramsSean Griffin2017-07-2412-231/+109
|/
* Use frozen-string-literal in ActiveRecordKir Shatrov2017-07-1921-0/+42
* Merge branch 'master' into fix_unscope_where_column_with_orSean Griffin2017-07-184-14/+14
|\
| * Fix `JoinDependency` with using a custom tableRyuta Kamizono2017-07-183-7/+6
| * Fix `where` with a custom tableRyuta Kamizono2017-07-181-1/+1
| * Remove useless `arel_engine`Ryuta Kamizono2017-07-171-1/+1
| * Fix code formatting for QueryMethods#selectRobin Dupret2017-07-161-2/+3
| * Fix `create_with` using both string and symbolRyuta Kamizono2017-07-162-3/+3
* | Bugfix: unscope(where: [columns]) would not remove the correct binds sometimesMaxime Lapointe2017-07-131-1/+2
|/
* Skip query cache for in_batches and friendsEugene Kenny2017-07-064-6/+12
* Merge branch 'master' into require_relative_2017Xavier Noria2017-07-021-2/+2
|\
| * Revert "Merge pull request #29540 from kirs/rubocop-frozen-string"Matthew Draper2017-07-0221-21/+0
| * Merge pull request #29540 from kirs/rubocop-frozen-stringMatthew Draper2017-07-0221-0/+21
| |\
| | * Enforce frozen string in RubocopKir Shatrov2017-07-0121-0/+21
| * | Merge pull request #29506 from pat/frozen-string-literalsMatthew Draper2017-07-021-2/+2
| |\ \ | | |/ | |/|
| | * Make ActiveRecord frozen string literal friendly.Pat Allan2017-06-201-2/+2
* | | [Active Record] require => require_relativeAkira Matsuda2017-07-015-15/+15
|/ /
* | Fix the next version of Rails from 5.3 to 6.0Ryuta Kamizono2017-06-291-2/+2
* | Deprecate delegating to `arel` in `Relation`Ryuta Kamizono2017-06-291-0/+2
* | Merge pull request #28932 from kamipo/remove_method_missing_in_relation_deleg...Rafael França2017-06-281-10/+0
|\ \
| * | Remove `method_missing` in `Relation::Delegation`Ryuta Kamizono2017-04-301-10/+0
* | | Merge pull request #29405 from kamipo/locked_should_not_build_arelRafael França2017-06-283-8/+4
|\ \ \
| * | | Remove delegating to arel in a relationRyuta Kamizono2017-06-293-8/+4
| | |/ | |/|
* | | Merge pull request #29556 from kamipo/extract_ordered_relationRafael França2017-06-271-12/+11
|\ \ \
| * | | Extract `ordered_relation` in `FinderMethods`Ryuta Kamizono2017-06-241-12/+11
| |/ /
* / / Fix extracting `references` via `order_values` to respect quotingRyuta Kamizono2017-06-261-1/+1
|/ /
* | Don't require 'unscope' to be the same for both sides of a 'or' relation.Dan Sherson2017-06-151-1/+1