Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'rails/master' into identity_map | Emilio Tagua | 2011-02-18 | 1 | -7/+7 |
|\ | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/association.rb activerecord/lib/active_record/fixtures.rb | ||||
| * | Split AssociationProxy into an Association class (and subclasses) which ↵ | Jon Leighton | 2011-02-18 | 1 | -7/+7 |
| | | | | | | | | manages the association, and a CollectionProxy class which is *only* a proxy. Singular associations no longer have a proxy. See CHANGELOG for more. | ||||
* | | Don't shadow outer local variable. | Emilio Tagua | 2011-02-15 | 1 | -2/+2 |
|/ | |||||
* | Add interpolation of association conditions back in, in the form of proc { ↵ | Jon Leighton | 2011-02-14 | 1 | -0/+4 |
| | | | | ... } rather than instance_eval-ing strings | ||||
* | Fix table name collision due to incorrect alias count on certain joins. | Ernie Miller | 2011-02-12 | 1 | -4/+4 |
| | | | | | | [#6423 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | Rename AssociationProxy#loaded to loaded! as it mutates the association | Jon Leighton | 2011-01-30 | 1 | -1/+1 |
| | |||||
* | Get rid of set_association_target and association_loaded? as the parts of ↵ | Jon Leighton | 2011-01-11 | 1 | -1/+2 |
| | | | | the code that need that can now just use association_proxy(:name).loaded?/target= | ||||
* | just use a hash for doing association caching | Aaron Patterson | 2011-01-07 | 1 | -2/+2 |
| | |||||
* | Have a proper AssociationReflection#foreign_type method rather than using ↵ | Jon Leighton | 2011-01-03 | 1 | -1/+1 |
| | | | | options[:foreign_type] | ||||
* | Rename AssociationReflection#primary_key_name to foreign_key, since the ↵ | Jon Leighton | 2010-12-31 | 1 | -4/+4 |
| | | | | options key which it relates to is :foreign_key | ||||
* | Refactor we_can_set_the_inverse_on_this? to use a less bizarre name amongst ↵ | Jon Leighton | 2010-12-26 | 1 | -2/+2 |
| | | | | other things | ||||
* | Fix problem where wrong keys are used in JoinAssociation when an association ↵ | Jon Leighton | 2010-12-20 | 1 | -9/+12 |
| | | | | goes :through a belongs_to [#2801 state:resolved] | ||||
* | taking advantage of the JoinSource node in the SQL AST | Aaron Patterson | 2010-12-16 | 2 | -15/+6 |
| | |||||
* | just use the regexp directly | Aaron Patterson | 2010-12-16 | 1 | -6/+4 |
| | |||||
* | combine regexp | Aaron Patterson | 2010-12-16 | 1 | -4/+2 |
| | |||||
* | move ivar to initialize, use triple dot rather than minus | Aaron Patterson | 2010-12-16 | 1 | -1/+1 |
| | |||||
* | explicitly set prefix | Aaron Patterson | 2010-12-16 | 1 | -1/+1 |
| | |||||
* | remove lasgn since AST is mutated | Aaron Patterson | 2010-12-16 | 1 | -2/+8 |
| | |||||
* | use table alias nodes rather than Table nodes | Aaron Patterson | 2010-12-10 | 1 | -3/+2 |
| | |||||
* | use alias nodes to represent table aliases | Aaron Patterson | 2010-12-10 | 1 | -3/+2 |
| | |||||
* | avoid *args on join_target_table | Aaron Patterson | 2010-12-10 | 1 | -3/+5 |
| | |||||
* | only quote the table name once per call | Aaron Patterson | 2010-12-10 | 1 | -6/+7 |
| | |||||
* | move join creation a little closer to where it is used | Aaron Patterson | 2010-12-09 | 1 | -3/+3 |
| | |||||
* | use inject rather than lasgn | Aaron Patterson | 2010-12-09 | 1 | -6/+5 |
| | |||||
* | removing useless lasgn | Aaron Patterson | 2010-12-09 | 1 | -1/+1 |
| | |||||
* | use sort_by | Aaron Patterson | 2010-12-08 | 1 | -1/+1 |
| | |||||
* | just allocate the table in initialize | Aaron Patterson | 2010-12-08 | 1 | -6/+4 |
| | |||||
* | fewer method calls, fewer code branches | Aaron Patterson | 2010-12-08 | 1 | -5/+4 |
| | |||||
* | only call active_record once | Aaron Patterson | 2010-12-08 | 1 | -2/+4 |
| | |||||
* | dry up calls to table_aliases | Aaron Patterson | 2010-12-08 | 1 | -4/+6 |
| | |||||
* | remove code that could never be executed | Aaron Patterson | 2010-12-08 | 1 | -4/+0 |
| | |||||
* | have table_aliases call count_aliases to set the default value | Aaron Patterson | 2010-12-08 | 2 | -5/+3 |
| | |||||
* | arel ignores the columns parameter | Aaron Patterson | 2010-12-08 | 1 | -2/+1 |
| | |||||
* | passing the ast to a table when the relation is a table | Aaron Patterson | 2010-12-07 | 1 | -2/+0 |
| | |||||
* | JoinDependency is always created with an AST now | Aaron Patterson | 2010-12-07 | 1 | -4/+10 |
| | |||||
* | passing the ast to JoinDependency | Aaron Patterson | 2010-12-07 | 1 | -2/+11 |
| | |||||
* | arel is lazy about column information, so no need to pass it around | Aaron Patterson | 2010-12-07 | 1 | -1/+1 |
| | |||||
* | reduce string objects, reduce method calls | Aaron Patterson | 2010-12-07 | 1 | -4/+5 |
| | |||||
* | save the AR reference rather than delegating | Aaron Patterson | 2010-12-07 | 1 | -4/+5 |
| | |||||
* | no need for self | Aaron Patterson | 2010-12-01 | 1 | -1/+1 |
| | |||||
* | JoinBase initialize can be deleted | Aaron Patterson | 2010-11-30 | 2 | -10/+3 |
| | |||||
* | removing interpolate_sql from join associations | Aaron Patterson | 2010-11-29 | 1 | -5/+1 |
| | |||||
* | moving method to subclass that actually uses the method | Aaron Patterson | 2010-11-29 | 2 | -1/+5 |
| | |||||
* | alias should be a SQL literal | Aaron Patterson | 2010-11-24 | 1 | -1/+1 |
| | |||||
* | initialize instance variables in initialize... o_O | Aaron Patterson | 2010-11-24 | 1 | -2/+2 |
| | |||||
* | adding a factory method to the join part for generating a table alias | Aaron Patterson | 2010-11-24 | 2 | -1/+5 |
| | |||||
* | use ARel rather than generate SQL strings | Aaron Patterson | 2010-11-24 | 1 | -2/+3 |
| | |||||
* | remove useless join | Aaron Patterson | 2010-11-24 | 1 | -1/+1 |
| | |||||
* | moving column_aliases to JoinDependency | Aaron Patterson | 2010-11-24 | 1 | -0/+8 |
| | |||||
* | breaking classes up in to respective files | Aaron Patterson | 2010-11-23 | 4 | -0/+604 |