aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/relation
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #15078 from nbudin/fix_merger_filter_binds_comparison_masterRafael Mendonça França2014-05-141-1/+1
|\
| * Make filter_binds filter out symbols that are equal to stringsNat Budin2014-05-141-1/+1
* | docs, explain usage of `count` + `select`. Closes #15065. [ci skip]Yves Senn2014-05-131-0/+8
|/
* Put back Relation#join method as a delegate to ArrayBogdan Gusiev2014-05-051-1/+1
* push up bind params on "simple" subquery calculationsAaron Patterson2014-05-021-2/+4
* Give real privacy to class methods in AR::PredicateBuilderHector Satre2014-05-011-7/+8
* Merge branch 'master' into adequaterecordAaron Patterson2014-04-254-5/+25
|\
| * reset `@arel` when modifying a Relation in place.Yves Senn2014-04-241-0/+12
| * Fix a typo in the doc of forty_two AR FinderMethodEric Bouchut2014-04-241-1/+1
| * Merge pull request #14757 from estsauver/14752Rafael Mendonça França2014-04-223-4/+12
| |\
| | * select! renamed to avoid name collision Array#select!Earl J St Sauver2014-04-213-4/+12
* | | Merge branch 'master' into adequaterecordAaron Patterson2014-04-201-1/+1
|\| |
| * | Make sure the column_name is different from 'all'.Lauro Caetano2014-04-141-1/+1
| |/
* | Merge branch 'master' into adequaterecordAaron Patterson2014-04-141-14/+22
|\|
| * don't bother with an offset if the offset is zeroAaron Patterson2014-04-121-6/+9
| * only add the offset and index when we need toAaron Patterson2014-04-121-8/+9
| * remove branching logic from calls to find_nthAaron Patterson2014-04-121-6/+10
* | Merge branch 'master' into adequaterecordAaron Patterson2014-04-073-6/+9
|\|
| * Build the reverse_order on its proper method.Lauro Caetano2014-04-072-4/+3
| * Ignore order when doing count.Lauro Caetano2014-04-071-1/+1
| * Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-03-291-1/+5
| |\
| | * Update documentation on group method to indicate it takes an arrayEarl St Sauver2014-03-171-0/+4
| | * Fix misspelling in references docsSteven Harman2014-03-141-1/+1
* | | Merge branch 'master' into adequaterecordAaron Patterson2014-03-251-0/+2
|\| |
| * | `where.not` adds `references` for `includes`.Yves Senn2014-03-171-0/+2
* | | Merge branch 'master' into adequaterecordAaron Patterson2014-03-131-2/+13
|\| |
| * | passing an instance of an AR object to `find` is deprecatedAaron Patterson2014-03-131-1/+5
| * | passing an ActiveRecord object to `exists?` is deprecated.Aaron Patterson2014-03-131-1/+8
| |/
* | `where` automatically uses bind values nowAaron Patterson2014-03-131-5/+2
* | Merge branch 'master' into adequaterecordAaron Patterson2014-03-132-18/+28
|\|
| * get rid of intermediate arrays.Yves Senn2014-03-051-2/+3
| * we only need to support `asc` and `ASC`. No need for mixed cases. #14263Yves Senn2014-03-051-13/+14
| * Merge pull request #14263 from robin850/allow_passing_string_to_order_hashYves Senn2014-03-051-3/+6
| |\
| | * Allow string hash values on AR order methodMarcelo Casiraghi2014-03-041-3/+6
| * | Make exists? use bound values.Martin Schürrer2014-03-041-1/+6
| |/
| * [ci skip] correct select examples and doc, ref [522c0fd]Kuldeep Aggarwal2014-03-011-4/+4
* | Merge branch 'master' into adequaterecordAaron Patterson2014-02-171-5/+3
|\|
| * Revert "Merge pull request #13344 from ccutrer/fix-from-default-select"Rafael Mendonça França2014-02-171-2/+0
| * No need to use symbolsRafael Mendonça França2014-02-161-3/+3
* | Merge branch 'master' into adequaterecordAaron Patterson2014-02-173-37/+149
|\|
| * guarantee a list in the alias tracker so we can remove a conditionalAaron Patterson2014-02-141-1/+9
| * Return sized enumerator from Batches#find_eachMarc-Andre Lafortune2014-02-051-1/+3
| * Return sized enumerator from Batches#find_in_batchesMarc-Andre Lafortune2014-02-051-4/+9
| * Make arel methods private APIRafael Mendonça França2014-02-011-4/+3
| * Let `unscope` ignore non Arel scope.where_valuesWashington Luiz2014-01-301-2/+0
| * Merge pull request #13878 from marcandre/leave_my_options_aloneRafael Mendonça França2014-01-301-2/+2
| |\
| | * find_in_batches should not mutate its argumentMarc-Andre Lafortune2014-01-291-2/+2
| * | docs, `references` is only used with `includes`. Closes #13727.Yves Senn2014-01-301-9/+14
| |/
| * Merge pull request #13201 from marcandre/find_in_batch_enumeratorRafael Mendonça França2014-01-291-0/+9
| |\
| | * `find_in_batches` now returns an `Enumerator` when called without a block, so...Marc-Andre Lafortune2013-12-061-0/+9