aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/relation
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | Mention find_each in find_in_batches doc [ci skip]Marc-Andre Lafortune2014-01-291-0/+2
| * | Handle aliased attributes in AR::Relation#select, #order, etc.Tsutomu Kuroda2014-01-291-1/+5
| * | Display value when raising due to unscope() issuesWashington Luiz2014-01-271-1/+1
| * | Fix `ActiveRecord::RecordNotFound` error message with custom primary keyKuldeep Aggarwal2014-01-251-2/+2
| * | Ensure AR #second, #third, etc. finders work through associationsJason Meller2014-01-211-8/+8
| * | prepend table name for `Relation#select` columns.Yves Senn2014-01-211-1/+4
| * | Fail early with "Primary key not included in the custom select clause" in fin...Alexander Balashov2014-01-211-5/+2
| * | Ensure #second acts like #first AR finderJason Meller2014-01-201-7/+87
* | | Remove outdated comment.Rafael Mendonça França2014-01-171-1/+0
* | | use a params hash so we know what bind parameters are usedAaron Patterson2014-01-151-1/+1
* | | reorder bind indexes if joins produced bind valuesAaron Patterson2014-01-141-0/+9
* | | take in to account existing bind parameters when building the bind listAaron Patterson2014-01-141-21/+20
* | | unscoping a where should remove bind valuesAaron Patterson2014-01-141-0/+2
* | | remove dead codeAaron Patterson2014-01-141-2/+0
* | | where needs to bring the bind params when creating a new relationAaron Patterson2014-01-141-0/+3
* | | we should not be copying these. fixes test_find_all_using_where_with_relation...Aaron Patterson2014-01-141-4/+0
* | | fixing column alias resolutionAaron Patterson2014-01-131-1/+1