aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | push preloaded test up to the factory method so we can eliminateAaron Patterson2013-09-244-9/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | conditionals from the individual preloaded classes
* | | | | | | | | | | | | we can't sort by lhs since the middle records have difference classesAaron Patterson2013-09-232-20/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and possibly different rules for finding those objects
* | | | | | | | | | | | | adding a test for sti on middle tables with sorting on RHSAaron Patterson2013-09-232-1/+19
| | | | | | | | | | | | |
* | | | | | | | | | | | | pass the preloader down so we only have to construct oneAaron Patterson2013-09-237-21/+21
| | | | | | | | | | | | |
* | | | | | | | | | | | | reuse the same preloader object for each associationAaron Patterson2013-09-231-2/+2
| | | | | | | | | | | | |
* | | | | | | | | | | | | remove state from the preloaderAaron Patterson2013-09-233-28/+18
| | | | | | | | | | | | |
* | | | | | | | | | | | | pass the scope all the way down to the constructorsAaron Patterson2013-09-231-10/+10
| | | | | | | | | | | | |
* | | | | | | | | | | | | only do the should_reset test onceAaron Patterson2013-09-231-6/+6
| | | | | | | | | | | | |
* | | | | | | | | | | | | fix variable names and speed up relation orderingAaron Patterson2013-09-232-16/+12
| | | | | | | | | | | | |
* | | | | | | | | | | | | hm:t preloading will respect order set on the RHS associationAaron Patterson2013-09-236-8/+68
| | | | | | | | | | | | |
* | | | | | | | | | | | | cache associated target records hashAaron Patterson2013-09-201-17/+11
| | | | | | | | | | | | |
* | | | | | | | | | | | | combine methods so we can reuse preloadersAaron Patterson2013-09-201-19/+18
| | | | | | | | | | | | |
* | | | | | | | | | | | | return a list rather than hashAaron Patterson2013-09-201-7/+13
| | | | | | | | | | | | |
* | | | | | | | | | | | | preserve order on the RHS queryAaron Patterson2013-09-201-0/+8
| | | | | | | | | | | | |
* | | | | | | | | | | | | split up construction and mutationAaron Patterson2013-09-201-1/+4
| | | | | | | | | | | | |
* | | | | | | | | | | | | fix method nameAaron Patterson2013-09-201-3/+5
| | | | | | | | | | | | |
* | | | | | | | | | | | | access preloaders independently of model mutationsAaron Patterson2013-09-201-12/+12
| | | | | | | | | | | | |
* | | | | | | | | | | | | push running the preloaders upAaron Patterson2013-09-201-19/+7
| | | | | | | | | | | | |
* | | | | | | | | | | | | push `run` up to preloadAaron Patterson2013-09-203-14/+41
| | | | | | | | | | | | |
* | | | | | | | | | | | | the hash should only ever be length one, so decompose itAaron Patterson2013-09-201-4/+5
| | | | | | | | | | | | |
* | | | | | | | | | | | | stop depending on preloader interals so we can create fewer preloaderAaron Patterson2013-09-201-19/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | objects
* | | | | | | | | | | | | lhs preload is always a single preload, so just preload oneAaron Patterson2013-09-201-3/+3
| | | | | | | | | | | | |
* | | | | | | | | | | | | just read the attribute rather than `send`ingAaron Patterson2013-09-201-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | extract exception raising, clean up group_by statementAaron Patterson2013-09-201-6/+7
| | | | | | | | | | | | |
* | | | | | | | | | | | | generate fewer objects when groupingAaron Patterson2013-09-201-5/+7
| | | | | | | | | | | | |
* | | | | | | | | | | | | do not access internal data structuresAaron Patterson2013-09-201-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | exposing target records on the preloaderAaron Patterson2013-09-202-16/+29
|/ / / / / / / / / / / /
* | | | | | | | | | | | remove unused variableAaron Patterson2013-09-181-1/+0
| | | | | | | | | | | |
* | | | | | | | | | | | support objects with blank string primary keysAaron Patterson2013-09-182-1/+7
| | | | | | | | | | | |
* | | | | | | | | | | | ActiveRecord::Base#<=> has been removed. Primary keys may not be in order,Aaron Patterson2013-09-183-16/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | or even be numbers, so sorting by id doesn't make sense. Please use `sort_by` and specify the attribute you wish to sort with. For example, change: Post.all.to_a.sort to: Post.all.to_a.sort_by(&:id)
* | | | | | | | | | | | do what the superclass does in the case that objects do not matchAaron Patterson2013-09-182-0/+10
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #12276 from kennyj/fix_12269Rafael Mendonça França2013-09-183-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Fix an issue where router can't recognize downcased url encoding path.
| * | | | | | | | | | | | Fix an issue where router can't recognize downcased url encoding path.kennyj2013-09-193-0/+11
|/ / / / / / / / / / / /
* | | | | | | | | | | | There's no need to do thisSantiago Pastorino2013-09-171-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AS does the following inside Time.find_zone! ... `ActiveSupport::TimeZone[time_zone] || TZInfo::Timezone.get(time_zone)` and given that the test is stubbing AS::TZ[] we don't need the removed code.
* | | | | | | | | | | | Merge pull request #12262 from sferik/remove_tzinfo_from_actionpackRafael Mendonça França2013-09-171-5/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Remove tzinfo dependency from Action Pack
| * | | | | | | | | | | | Remove tzinfo dependency from Action PackErik Michaels-Ober2013-09-171-5/+4
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This gem is used by Active Support but it should not be a dependency of Action Pack.
* | | | | | | | | | | | Merge pull request #12250 from JuanitoFatas/migrationRafael Mendonça França2013-09-161-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Improve readability of 4.3's NOTE in migration.md.
| * | | | | | | | | | | | [ci skip] Improve readability of 4.3's NOTE in migration.md.Juanito Fatas2013-09-171-3/+3
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #12011 from jetthoughts/11963_fix_join_with_association_scopeRafael Mendonça França2013-09-164-6/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Collapse where constraints to the Arel::Nodes::And node Conflicts: activerecord/CHANGELOG.md
| * | | | | | | | | | | | Collapse where constraints to one where constraintPaul Nikitochkin2013-09-134-6/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to remove duplication with joining arel where constraints with `AND`, all constraints on `build_arel` are collapsed into one head node: `Arel::Nodes::And` Closes: #11963
* | | | | | | | | | | | | Merge pull request #12245 from kennyj/remove_no_using_code_20130916José Valim2013-09-161-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes unused code related to DatabaseTasks.
| * | | | | | | | | | | | | Removes unused code related to DatabaseTasks.kennyj2013-09-161-4/+0
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #12239 from JuanitoFatas/form_helpersSteve Klabnik2013-09-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Consistency wording of 9.6 in form_helpers.md
| * | | | | | | | | | | | | [ci skip] Consistency wording of 9.6 in form_helpers.mdJuanito Fatas2013-09-151-1/+1
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Chapter 9 is giving a user and set of addresses example. So 'Add a new address' would be more consistent. Also change the javascript to JavaScript.
* | | | | | | | | | | | | Merge pull request #12231 from harshadsabne/masterSteve Klabnik2013-09-141-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | [ci skip] Update plugins.md
| * | | | | | | | | | | | [ci skip] Update plugins.mdHarshad Sabne2013-09-141-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Highlighted code.
* | | | | | | | | | | | | Merge pull request #12225 from adomokos/no_need_for_active_support_concernSteve Klabnik2013-09-131-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing ActiveSupport::Concern, it's not needed
| * | | | | | | | | | | | | Removing ActiveSupport::Concern, it's not neededAttila Domokos2013-09-131-2/+0
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #12223 from adomokos/fixing_typoRafael Mendonça França2013-09-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing comment typo in ActionController::Base
| * | | | | | | | | | | | | Fixing comment typo in ActionController::BaseAttila Domokos2013-09-131-1/+1
|/ / / / / / / / / / / / /