Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | make joins generation method look similar | Aaron Patterson | 2013-10-21 | 1 | -6/+9 |
| | |||||
* | remove node duping code | Aaron Patterson | 2013-10-21 | 1 | -57/+19 |
| | |||||
* | refactor outer join generation | Aaron Patterson | 2013-10-21 | 1 | -11/+6 |
| | |||||
* | add outer joins for matching nodes | Aaron Patterson | 2013-10-21 | 1 | -2/+14 |
| | |||||
* | construct joins by walking the outer join tree | Aaron Patterson | 2013-10-21 | 1 | -5/+34 |
| | |||||
* | pass the outer joins to join_constraints | Aaron Patterson | 2013-10-20 | 2 | -6/+3 |
| | |||||
* | disconnect join_constraints from the instance | Aaron Patterson | 2013-10-20 | 2 | -3/+3 |
| | |||||
* | pass in scope chain so reflection is not needed | Aaron Patterson | 2013-10-20 | 2 | -3/+3 |
| | |||||
* | pass the foreign table and class to the join_constraints method | Aaron Patterson | 2013-10-20 | 2 | -5/+4 |
| | |||||
* | pass the join type to the join_constraints method | Aaron Patterson | 2013-10-20 | 2 | -2/+3 |
| | |||||
* | Merge branch 'master' into joindep | Aaron Patterson | 2013-10-16 | 4 | -108/+13 |
|\ | | | | | | | | | | | | | * master: Rephrase ActiveRecord transaction rollback warning Fix code blocks identation on AR and AS CHANGELOGs Removing unused fake models from actionpack tests | ||||
| * | Merge pull request #12545 from nateberkopec/rephrase_callback_warning | Yves Senn | 2013-10-16 | 1 | -1/+1 |
| |\ | | | | | | | Rephrase ActiveRecord transaction rollback warning [ci skip] | ||||
| | * | Rephrase ActiveRecord transaction rollback warning | Nate Berkopec | 2013-10-16 | 1 | -1/+1 |
| | | | | | | | | | | | | [ci skip] | ||||
| * | | Merge pull request #12558 from lucasmazza/changelog-fixes | Rafael Mendonça França | 2013-10-16 | 2 | -12/+12 |
| |\ \ | | | | | | | | | Fix code blocks identation on AR and AS CHANGELOGs | ||||
| | * | | Fix code blocks identation on AR and AS CHANGELOGs | Lucas Mazza | 2013-10-16 | 2 | -12/+12 |
| |/ / | |||||
| * | | Merge pull request #12553 from tchandy/master | Guillermo Iguaran | 2013-10-15 | 1 | -95/+0 |
| |\ \ | | | | | | | | | Removing unused fake models from actionpack tests | ||||
| | * | | Removing unused fake models from actionpack tests | Thiago Pradi | 2013-10-16 | 1 | -95/+0 |
| |/ / | |||||
* | | | use the node as cache so we can avoid accessing the table | Aaron Patterson | 2013-10-15 | 1 | -13/+13 |
| | | | |||||
* | | | apply tables to the whole tree from the outside | Aaron Patterson | 2013-10-15 | 1 | -14/+8 |
| | | | |||||
* | | | apply table aliases after the AST has been built | Aaron Patterson | 2013-10-15 | 1 | -1/+13 |
| | | | |||||
* | | | stop reversing tables until we absolutely must | Aaron Patterson | 2013-10-15 | 2 | -3/+3 |
| | | | |||||
* | | | pass the chain the join_constraints | Aaron Patterson | 2013-10-15 | 2 | -3/+4 |
| | | | |||||
* | | | Merge branch 'master' into joindep | Aaron Patterson | 2013-10-15 | 6 | -5/+12 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: use the cached arel table Fix typo in the changelog entry Don't remove the select values to add they back again Pluck on NullRelation accepts a list of columns Conflicts: activerecord/lib/active_record/relation/finder_methods.rb | ||||
| * | | use the cached arel table | Aaron Patterson | 2013-10-15 | 2 | -2/+2 |
| | | | |||||
| * | | Fix typo in the changelog entry | Rafael Mendonça França | 2013-10-15 | 1 | -1/+1 |
| | | | | | | | | | | | | [ci skip] | ||||
| * | | Don't remove the select values to add they back again | Rafael Mendonça França | 2013-10-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/relation/finder_methods.rb | ||||
| * | | Merge pull request #12547 from derekprior/dp-fix-null-relation-pluck | Rafael Mendonça França | 2013-10-15 | 3 | -2/+9 |
| |\ \ | | | | | | | | | Pluck on NullRelation should accept a list of columns | ||||
| | * | | Pluck on NullRelation accepts a list of columns | Derek Prior | 2013-10-15 | 3 | -2/+9 |
| | |/ | | | | | | | | | | | | | | | | `pluck` was updated to accept a list of columns, but the `NullRelation` was never updated to match that signature. As a result, calling `pluck` on a `NullRelation` results in an `ArgumentError`. | ||||
* | | | Merge branch 'master' into joindep | Aaron Patterson | 2013-10-15 | 56 | -203/+365 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (44 commits) grammar fix (reverted in e9a1ecd) Revert "fixed a doc bug in the CHANGELOG.md s/does no longer depend on/no longer depends on/" Add missed require making `enable_warnings` available Prepare generated Gemfile for Capistrano 3 Added --model-name option scaffold_controller_generator. read the association instead of sending we should have unique sponsorable ids in the fixtures at least simplify populating the ordering hash the preloader for the RHS has all the preloaded records, so ask it only calculate offset index once. #12537 Remove size alias for length validation Fix `singleton_class?` Minor Refactoring to `NumberHelper#number_to_human` `$SAFE = 4;` has been removed with Ruby 2.1 scope_chain should not be mutated for other reflections Remove `default_primary_key_type` and extract contains of `native_database_types` to a constant since they aren't conditional now in SQLite3Adapter. Makes it more like other adapters. cleanup changelog entry format. [ci skip] Extract a function to determine if the default value is a function Push default_function to superclass to avoid method check Dump the default function when the primary key is uuid ... Conflicts: activerecord/lib/active_record/relation/finder_methods.rb | ||||
| * | | grammar fix (reverted in e9a1ecd) | Vijay Dev | 2013-10-15 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2013-10-15 | 1 | -1/+1 |
| |\ \ | | |/ | |/| | |||||
| | * | Revert "fixed a doc bug in the CHANGELOG.md s/does no longer depend on/no ↵ | Vijay Dev | 2013-10-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | longer depends on/" This reverts commit 49f513c25415f94452af1bb8fe3f55f090a6d0f2. Reason: Changelogs aren't supposed to be edited in docrails. | ||||
| | * | Use ActiveRecord::Base#update! instead of #update_attributes! | Zachary Scott | 2013-09-28 | 1 | -1/+1 |
| | | | |||||
| | * | fixed a doc bug in the CHANGELOG.md s/does no longer depend on/no longer ↵ | Zachary Scott | 2013-09-28 | 1 | -1/+1 |
| | | | | | | | | | | | | depends on/ | ||||
| * | | Merge pull request #12524 from kirs/patch-1 | Rafael Mendonça França | 2013-10-15 | 1 | -1/+1 |
| |\ \ | | | | | | | | | Prepare generated Gemfile for Capistrano 3 | ||||
| | * | | Prepare generated Gemfile for Capistrano 3 | Kir Shatrov | 2013-10-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Capistrano 3 is now rails-less, so we need to encourage developers to use capistrano-rails gem. More details: http://www.capistranorb.com/documentation/frameworks/ruby-on-rails/ [ci skip] | ||||
| * | | | Merge pull request #12543 from route/missed_require | Rafael Mendonça França | 2013-10-15 | 1 | -0/+1 |
| |\ \ \ | | | | | | | | | | | Add missed require making `enable_warnings` available | ||||
| | * | | | Add missed require making `enable_warnings` available | Dmitry Vorotilin | 2013-10-15 | 1 | -0/+1 |
| |/ / / | |||||
| * | | | Merge pull request #11432 from yalab/generate_model_name_option | Yves Senn | 2013-10-15 | 5 | -6/+53 |
| |\ \ \ | | | | | | | | | | | Add --model-name option into scaffold_controller generator | ||||
| | * | | | Added --model-name option scaffold_controller_generator. | yalab | 2013-10-15 | 5 | -6/+53 |
| |/ / / | |||||
| * | | | Merge pull request #12534 from vipulnsward/minor_number_helper_perfs | Rafael Mendonça França | 2013-10-14 | 1 | -4/+2 |
| |\ \ \ | | | | | | | | | | | Minor Refactoring to `NumberHelper#number_to_human` | ||||
| | * | | | Minor Refactoring to `NumberHelper#number_to_human` | Vipul A M | 2013-10-14 | 1 | -4/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | * Use destructive `map` and `sort_by` to save extra object creation. * Create `INVERTED_DECIMAL_UNITS.invert` constant instead of repeatedly doing `DECIMAL_UNITS.invert` | ||||
| * | | | | read the association instead of sending | Aaron Patterson | 2013-10-14 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | we should have unique sponsorable ids in the fixtures at least | Aaron Patterson | 2013-10-14 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge pull request #12536 from sbagdat/patch-1 | Rafael Mendonça França | 2013-10-14 | 1 | -2/+0 |
| |\ \ \ \ | | | | | | | | | | | | | Remove size alias for length validation | ||||
| | * | | | | Remove size alias for length validation | Sıtkı Bağdat | 2013-10-14 | 1 | -2/+0 |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed ```The `size` helper is an alias for `length`.``` line. If you use this "nonexist" helper, you will get an error message like this: ``` ArgumentError: Unknown validator: 'SizeValidator' ... ``` Maybe wanted to mean ```validates_size_of``` helper as an alias for ```validates_length_of``` helper. | ||||
| * | | | | simplify populating the ordering hash | Aaron Patterson | 2013-10-14 | 1 | -10/+5 |
| | | | | | |||||
| * | | | | the preloader for the RHS has all the preloaded records, so ask it | Aaron Patterson | 2013-10-14 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | only calculate offset index once. #12537 | Aaron Patterson | 2013-10-14 | 1 | -6/+10 |
| | | | | | |||||
| * | | | | Merge pull request #10538 from neerajdotname/3882 | Rafael Mendonça França | 2013-10-14 | 9 | -1/+65 |
| |\ \ \ \ | | | | | | | | | | | | | scope_chain should not be mutated for other reflections |