aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/relation
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-046-74/+104
|\
| * Move JoinDependency and friends from ActiveRecord::Associations::ClassMethods...Jon Leighton2011-02-282-4/+4
| * use an attribute rather than a SQL literalAaron Patterson2011-02-261-1/+1
| * removing limits and offsets from COUNT queries unless both are specified. [#6...Aaron Patterson2011-02-251-1/+13
| * merges docrailsXavier Noria2011-02-181-1/+1
| |\
| | * Fix Typos: remove several occurences of the theNicholas Rowe2011-02-171-1/+1
| * | Split AssociationProxy into an Association class (and subclasses) which manag...Jon Leighton2011-02-181-1/+1
| * | explicitly allowing lolqueriesAaron Patterson2011-02-161-10/+1
| * | use the arel table rather than generating stringsAaron Patterson2011-02-161-1/+1
| * | no need for Array.wrapAaron Patterson2011-02-161-1/+1
| * | removed an unnecessary second query when passing an ActiveRecord::Relation to...Steven Fenigstein2011-02-161-1/+4
| * | Remove Relation#& alias for Relation#mergeErnie Miller2011-02-121-2/+0
| * | limit() should sanitize limit valuesAaron Patterson2011-02-081-1/+1
| |/
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-02-051-1/+1
| |\
| | * keep options titles consistent to "Options"Gabriel Horner2011-02-031-1/+1
| * | The type_cast_calculated_value method will trust DB types before casting to a...Ken Collins2011-02-031-1/+1
| |/
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-01-201-0/+14
| |\
| | * document ActiveRecord's except and onlyJordi Romero2011-01-151-0/+14
| * | Always return decimal average of integer fieldsRaimonds Simanovskis2011-01-101-9/+5
| * | use select_all because not all database adapters support bind valuesAaron Patterson2011-01-081-1/+1
| * | stop creating intermediate AR objects, just construct AR objects from a list ...Aaron Patterson2011-01-071-1/+2
| * | Explicitly select * from has_and_belongs_to_many association tables, simplify...Raimonds Simanovskis2011-01-041-1/+1
| * | ActiveRecord::Relation#primary_key should return a string, just like ActiveRe...Jon Leighton2011-01-034-14/+14
| * | Make Relation#create_with always merge rather than overwrite, not just when m...Jon Leighton2011-01-032-4/+2
| * | Let AssociationCollection#find use #scoped to do its finding. Note that I am ...Jon Leighton2011-01-031-1/+1
| * | User id instead of quoted_id to prevent double quoting. Fixes failing test fo...Robert Pankowecki (Gavdi)2011-01-041-1/+1
| * | Rename AssociationReflection#primary_key_name to foreign_key, since the optio...Jon Leighton2010-12-311-1/+1
| * | Specify the STI type condition using SQL IN rather than a whole load of ORs. ...Jon Leighton2010-12-311-1/+5
| |/
| * arel can escape the id, so avoid using the database connectionAaron Patterson2010-12-221-1/+1
| * Arel::Table#[] always returns an attribute, so no need for ||Aaron Patterson2010-12-221-1/+1
| * to_sym stuff before passing it to arelAaron Patterson2010-12-221-1/+1
| * ActiveRecord::Base.joins should allow single nil argument [#6181 state:resolved]Piotr Sarnacki2010-12-161-1/+1
| * make sure that join nodes are uniqAaron Patterson2010-12-161-1/+1
| * supporting arel AST nodes when building join statementsAaron Patterson2010-12-161-3/+15
| * bucketing based on join typeAaron Patterson2010-12-161-8/+17
| * taking advantage of the JoinSource node in the SQL ASTAaron Patterson2010-12-162-17/+8
| * remove lasgn since AST is mutatedAaron Patterson2010-12-161-1/+1
| * just mutate the ast, fewer lasgnsAaron Patterson2010-12-161-3/+2
* | remove lasgn since AST is mutatedAaron Patterson2010-12-101-1/+1
* | just mutate the ast, fewer lasgnsAaron Patterson2010-12-101-3/+2
|/
* no more manager manipulation if there is no custom join astAaron Patterson2010-12-101-6/+5
* froms should never equal 0Aaron Patterson2010-12-101-2/+0
* manager will always be a managerAaron Patterson2010-12-101-10/+6
* eliminate lasgnsAaron Patterson2010-12-101-10/+10
* dealing with an AST manager, not a relation, so fix the variable namesAaron Patterson2010-12-101-12/+12
* adding a fixme commentAaron Patterson2010-12-081-0/+1
* renaming variables, making the join_ast method privateAaron Patterson2010-12-081-51/+27
* further reducing dependence on custom_joinsAaron Patterson2010-12-081-0/+2
* reducing use of custom joinsAaron Patterson2010-12-081-1/+6
* passing the ast to a table when the relation is a tableAaron Patterson2010-12-071-3/+20