aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/relation.rb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into adequaterecordAaron Patterson2014-04-141-5/+6
|\
| * Make the comparison between 'Relation' and 'AssociationRelation'Lauro Caetano2014-04-121-1/+1
| * The comparison between `Relation` and `CollectionProxy` should be consistent.Lauro Caetano2014-04-111-0/+2
| * Merge pull request #14711 from swoker/activerecord_fix_aggregate_methods_with...Rafael Mendonça França2014-04-111-3/+2
| |\
| | * Fix error for aggregate methods with select, see issue #13648Simon Woker2014-04-101-3/+2
| * | Merge pull request #12829 from iantropov/issue_insert_via_hmt_scope_3548Rafael Mendonça França2014-04-101-2/+2
| |\ \ | | |/ | |/|
| | * Fix insertion of records for hmt association with scope, fix #3548Ivan Antropov2013-11-171-2/+2
* | | propogate bind values collected in arel to SQL generationAaron Patterson2014-04-111-1/+2
* | | remove the bind substitution visitor. to_sql should never return bind valuesAaron Patterson2014-04-091-5/+6
* | | use the compile method so we do not have to specify the collectors in this caseAaron Patterson2014-04-091-2/+1
* | | working against arel/collector branchAaron Patterson2014-04-091-1/+2
* | | where_values should extract the value of the Casted nodeAaron Patterson2014-04-071-1/+7
* | | Merge branch 'master' into adequaterecordAaron Patterson2014-04-071-1/+1
|\| |
| * | Merge pull request #11650 from prathamesh-sonpatki/renameRafael Mendonça França2014-04-041-1/+1
| |\ \
| | * | [Active Record] Renamed private methods create_record and update_recordPrathamesh Sonpatki2014-02-201-1/+1
* | | | Merge branch 'master' into adequaterecordAaron Patterson2014-03-131-1/+10
|\| | |
| * | | `includes` uses SQL parsing when String joins are involved.Yves Senn2014-02-281-1/+10
| |/ /
* | | Merge branch 'master' into adequaterecordAaron Patterson2014-02-171-2/+3
|\| |
| * | Remove duplicate mergekei2014-01-221-1/+0
| * | Remove missed usage of @first variableCarlos Antonio da Silva2014-01-211-1/+1
| * | Remove unneded argumentRafael Mendonça França2014-01-201-2/+2
| * | Ensure #second acts like #first AR finderJason Meller2014-01-201-1/+3
* | | Revert "adding set_binds"Aaron Patterson2014-01-171-8/+0
* | | replace bind values on calls to to_sqlAaron Patterson2014-01-131-4/+4
* | | adding bind values to the manager objectAaron Patterson2014-01-131-1/+1
* | | Merge branch 'master' into set_bindsAaron Patterson2014-01-111-99/+84
|\| |
| * | Fix ActiveRecord::Relation#unscopeJon Leighton2013-11-201-1/+1
| |/
| * pass the pk to compile_updateAaron Patterson2013-11-161-1/+1
| * Fix test name [ci skip]Carlos Antonio da Silva2013-11-141-2/+0
| * Fix that eager loading of polymorphic associations did not work with associat...David Heinemeier Hansson2013-11-141-1/+9
| * Merge branch 'master' into joindepAaron Patterson2013-10-211-2/+1
| |\
| | * In Relation#empty? use #exists? instead of #count.Szymon Nowak2013-10-191-2/+1
| * | eliminate duplicate code from to_sqlAaron Patterson2013-10-131-3/+1
| * | push up `select` exclusionAaron Patterson2013-10-131-1/+2
| |/
| * reuse the same preloader object for each associationAaron Patterson2013-09-231-2/+2
| * remove state from the preloaderAaron Patterson2013-09-231-1/+2
| * refactor to_sql so it does not depend on the to_sql implementation ofAaron Patterson2013-07-081-4/+11
| * fix to_sql output on eager loaded relationsAaron Patterson2013-07-021-1/+9
| * remove deprecated implicit join references.Yves Senn2013-06-291-37/+2
| * Simplify/fix implementation of default scopesJon Leighton2013-06-281-35/+15
| * cleanup whitespace in relation.rbYves Senn2013-06-091-1/+1
| * Revert "Merge pull request #10539 from davidcelis/ar-sql-improvements"Jon Leighton2013-06-071-1/+5
| * ActiveRecord::Relation#blank? should `LIMIT 1`David Celis2013-06-071-5/+1
| * revises the documentation of ActiveRecord::Relation#find_or_create_by [ci skip]Xavier Noria2013-06-011-14/+38
| * `implicit_readonly` is being removed in favor of calling `readonly` explicitlyYves Senn2013-05-271-5/+1
| * cleanup whitespace in `active_record/relation.rb`.Yves Senn2013-05-271-4/+4
* | adding set_bindsAaron Patterson2013-05-211-0/+8
* | Merge branch 'master' into stmtAaron Patterson2013-05-171-2/+4
|\|
| * include bind values from the default scopeAaron Patterson2013-05-171-2/+4
* | more testingAaron Patterson2013-05-171-14/+1