aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Expand)AuthorAgeFilesLines
...
| * | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-056-9/+19
| |\|
| | * use Arel::Table#alias rather than passing the :as parameterAaron Patterson2011-03-052-4/+4
| | * Active Record typos.R.T. Lechow2011-03-053-4/+4
| | * fixes a missmatched column in examplemjy2011-03-051-1/+1
| | * implements ActiveRecord::Base.connection_config to be able to check the confi...Xavier Noria2011-03-051-0/+10
| | * When preloading has_and_belongs_to_many associations, we should only instanti...Jon Leighton2011-03-041-2/+4
| | * Fix a couple of tests in join_model_test.rb which were failing when the ident...Jon Leighton2011-03-041-2/+2
| * | Use Base#type_condition in JoinAssociationJon Leighton2011-03-052-17/+6
| * | Push source_type and polymorphic conditions out of ThroughAssociation and Joi...Jon Leighton2011-03-053-45/+11
| * | Add a test for STI on the through where the through is nested, and change the...Jon Leighton2011-03-052-13/+25
| * | Stop identity-mapping the through records in the preloader since I fixed the ...Jon Leighton2011-03-041-5/+0
| * | Fix a couple of tests in join_model_test.rb which were failing when the ident...Jon Leighton2011-03-041-2/+2
| * | When preloading has_and_belongs_to_many associations, we should only instanti...Jon Leighton2011-03-041-2/+4
| * | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-041-0/+5
| |\|
| * | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-04101-4174/+5652
| |\ \
| * \ \ Merge branch 'master' into nested_has_many_throughJon Leighton2010-12-1237-324/+387
| |\ \ \
| | * | | just use the regexp directlyAaron Patterson2010-12-101-6/+4
| | * | | combine regexpAaron Patterson2010-12-101-4/+2
| | * | | reduce method callsAaron Patterson2010-12-101-1/+1
| | * | | move ivar to initialize, use triple dot rather than minusAaron Patterson2010-12-102-2/+2
| | * | | explicitly set prefixAaron Patterson2010-12-101-1/+1
| | * | | remove lasgn since AST is mutatedAaron Patterson2010-12-102-3/+9
| | * | | just mutate the ast, fewer lasgnsAaron Patterson2010-12-101-3/+2
| * | | | Merge branch 'master' into nested_has_many_throughJon Leighton2010-11-2733-831/+1064
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into nested_has_many_throughJon Leighton2010-11-1726-104/+132
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into nested_has_many_throughJon Leighton2010-11-089-73/+65
| |\ \ \ \ \ \
| * | | | | | | Fix naughty trailing whitespaceJon Leighton2010-10-317-133/+133
| * | | | | | | Merge branch 'master' into nested_has_many_throughJon Leighton2010-10-315-34/+68
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into nested_has_many_throughJon Leighton2010-10-2817-126/+386
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Remove obsolete require to active_record/associations/nested_has_many_throughJon Leighton2010-10-191-1/+0
| * | | | | | | | | Fix typoJon Leighton2010-10-191-1/+1
| * | | | | | | | | Remove obsolete autoloadJon Leighton2010-10-191-1/+0
| * | | | | | | | | Merge branch 'master' into nested_has_many_throughJon Leighton2010-10-199-30/+23
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add some API documentation about nested through associationsJon Leighton2010-10-191-8/+52
| * | | | | | | | | | Add some comments for ThroughReflection#through_reflection_chainJon Leighton2010-10-191-1/+10
| * | | | | | | | | | Remove various comments and code which were just being used during the develo...Jon Leighton2010-10-194-194/+0
| * | | | | | | | | | Add explicit tests for the nested through association changes in reflection.rbJon Leighton2010-10-191-2/+13
| * | | | | | | | | | Small refactoringJon Leighton2010-10-191-6/+2
| * | | | | | | | | | Support the :primary_key option on a through reflection in a nested through a...Jon Leighton2010-10-191-5/+2
| * | | | | | | | | | Bugfix/refactoringJon Leighton2010-10-193-11/+20
| * | | | | | | | | | Remove unused methodsJon Leighton2010-10-191-11/+0
| * | | | | | | | | | Support for :primary_key option on the source reflection of a through associa...Jon Leighton2010-10-193-8/+14
| * | | | | | | | | | Respect the :primary_key option on the through_reflection of (non-nested) thr...Jon Leighton2010-10-193-8/+8
| * | | | | | | | | | Properly support conditions on any of the reflections involved in a nested th...Jon Leighton2010-10-193-76/+119
| * | | | | | | | | | Refactoring: replace the mix of variables like @finder_sql, @counter_sql, etc...Jon Leighton2010-10-1711-154/+138
| * | | | | | | | | | Make sure nested through associations are read onlyJon Leighton2010-10-155-9/+40
| * | | | | | | | | | Fix small bug which was shown by the last commitJon Leighton2010-10-151-1/+1
| * | | | | | | | | | Support preloading nested through associations (using the default multi-query...Jon Leighton2010-10-151-61/+76
| * | | | | | | | | | Added test_has_many_through_has_many_with_has_many_through_habtm_source_refle...Jon Leighton2010-10-141-2/+6
| * | | | | | | | | | Fix bug in previous refactoringJon Leighton2010-10-141-6/+6