aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Refactor ThroughAssociation#join_to to be much smaller, and independent of ↵Jon Leighton2011-03-062-84/+34
| | | | construct_owner_conditions.
* Refactor ThroughAssociation#tables to just be a flat array of tables in the ↵Jon Leighton2011-03-061-75/+70
| | | | order that they should be joined together.
* Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-0563-117/+380
|\ | | | | | | | | Conflicts: activerecord/CHANGELOG
| * use Arel::Table#alias rather than passing the :as parameterAaron Patterson2011-03-052-4/+4
| |
| * revises the RDoc of Hash#reverse_mergeXavier Noria2011-03-051-13/+7
| |
| * copy-edits 819762cXavier Noria2011-03-051-4/+3
| | | | | | | | | | * simplifies some sentences * use a more neutral language with less you/yours
| * copy-edits 108561fXavier Noria2011-03-051-1/+1
| |
| * typo changesJudeArasu2011-03-051-3/+4
| |
| * Railties typos.R.T. Lechow2011-03-054-6/+6
| |
| * Action Pack typos.R.T. Lechow2011-03-0511-15/+15
| |
| * Active Record typos.R.T. Lechow2011-03-056-10/+10
| |
| * Active Support typos.R.T. Lechow2011-03-057-7/+7
| |
| * Active Resource typos.R.T. Lechow2011-03-055-6/+6
| |
| * Active Model typos.R.T. Lechow2011-03-052-2/+2
| |
| * Properly escaped a + in the dynamic segments TIPtashian2011-03-051-1/+1
| |
| * Adds link to Object.blank? from Object.present?Jonathon D. Jones2011-03-051-1/+1
| |
| * fixes a missmatched column in examplemjy2011-03-051-1/+1
| |
| * Spelling mistakeJudeArasu2011-03-051-1/+2
| |
| * Correct spelling for Base64 in action_mailerDalibor Nasevic2011-03-051-1/+1
| |
| * Removed link to un-existing Issues page on GithubDalibor Nasevic2011-03-051-3/+0
| |
| * Added some new advice on applying patchesLars Smit2011-03-051-0/+14
| |
| * Fix incorrect example.Ben Orenstein2011-03-051-2/+2
| |
| * Fix incorrect word.Ben Orenstein2011-03-051-1/+1
| |
| * Pointing out that dynamic_form plugin must be installed to be able to use ↵Rodrigo Navarro2011-03-051-1/+14
| | | | | | | | error_messages and error_messages_for view helpers.
| * Clean up wording.Ben Orenstein2011-03-051-1/+1
| |
| * use resources in place of map.resourcesVijay Dev2011-03-051-1/+1
| |
| * Clarify comment by removing french reference ('a la'). Should improve ↵Ben Orenstein2011-03-051-1/+1
| | | | | | | | readability for non-native english speakers.
| * Example descriptions and their examples were flipped. Fix.Ben Orenstein2011-03-051-3/+3
| |
| * Warn people that these methods are deprecated.Ben Orenstein2011-03-051-0/+2
| |
| * Correct example that did not do what it claimed. Rework explanation.Ben Orenstein2011-03-051-5/+5
| |
| * added information about TEST_DIR env variableIlya Zayats2011-03-051-0/+8
| |
| * implements ActiveRecord::Base.connection_config to be able to check the ↵Xavier Noria2011-03-053-0/+18
| | | | | | | | configuration of the current connection at runtime
| * Fix CISantiago Pastorino2011-03-041-8/+8
| |
| * When preloading has_and_belongs_to_many associations, we should only ↵Jon Leighton2011-03-042-2/+20
| | | | | | | | instantiate one AR object per actual record in the database. (Even when IM is off.)
| * Fix a couple of tests in join_model_test.rb which were failing when the ↵Jon Leighton2011-03-041-2/+2
| | | | | | | | identity map is turned off
| * Make CI test with and without IMSantiago Pastorino2011-03-041-4/+44
| |
| * reverted tests deleted by 080345baca1076a9788d, refactored implementations ↵Diego Carrion2011-03-041-3/+13
| | | | | | | | | | | | should not invalidate the validations Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * refactored Time#<=> and DateTime#<=> by removing unnecessary calls without ↵Diego Carrion2011-03-043-20/+5
| | | | | | | | | | | | losing performance Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * Add an option to FormBuilder to omit hidden field with idAlexander Uvarov2011-03-042-2/+157
| | | | | | | | | | | | [#4551 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * log and readme should respect --quietJosé Valim2011-03-042-3/+29
| |
* | Use Base#type_condition in JoinAssociationJon Leighton2011-03-052-17/+6
| |
* | Push source_type and polymorphic conditions out of ThroughAssociation and ↵Jon Leighton2011-03-054-47/+13
| | | | | | | | JoinDependency::JoinAssociation and into the reflection instead.
* | Add a test for STI on the through where the through is nested, and change ↵Jon Leighton2011-03-056-13/+46
| | | | | | | | the code which support this
* | Stop identity-mapping the through records in the preloader since I fixed the ↵Jon Leighton2011-03-041-5/+0
| | | | | | | | underlying problem in the habtm preloader.
* | Fix a couple of tests in join_model_test.rb which were failing when the ↵Jon Leighton2011-03-041-2/+2
| | | | | | | | identity map is turned off
* | When preloading has_and_belongs_to_many associations, we should only ↵Jon Leighton2011-03-042-2/+20
| | | | | | | | instantiate one AR object per actual record in the database. (Even when IM is off.)
* | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-045-9/+28
|\|
| * only compute path.to_s onceAaron Patterson2011-03-021-1/+4
| |
| * remove to_s implementation so that inspect is helpfulAaron Patterson2011-03-021-1/+0
| |
| * * LocalCache strategy is now a real middleware class, not an anonymous classAaron Patterson2011-03-022-23/+32
| | | | | | | | posing for pictures.