Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4282 from edgecase/order_after_reorder | Aaron Patterson | 2012-01-04 | 1 | -2/+11 |
| | | | | correctly handle order calls after a reorder | ||||
* | default create_with_value to a hash so we can eliminate conditionals, add ↵ | Aaron Patterson | 2011-06-27 | 1 | -1/+1 |
| | | | | test surrounding create_with(nil) behavior | ||||
* | Evaluate default scopes at the last possible moment in order to avoid ↵ | Jon Leighton | 2011-04-12 | 1 | -0/+4 |
| | | | | problems with default scopes getting included into other scopes and then being unable to remove the default part via unscoped. | ||||
* | Reapply extensions when using except and only | Iain Hecker | 2011-03-21 | 1 | -0/+6 |
| | |||||
* | Remove Relation#& alias for Relation#merge | Ernie Miller | 2011-02-12 | 1 | -2/+0 |
| | |||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-01-20 | 1 | -0/+14 |
|\ | |||||
| * | document ActiveRecord's except and only | Jordi Romero | 2011-01-15 | 1 | -0/+14 |
| | | | | | | | | Document methods that allow easily override arel queries | ||||
* | | Make Relation#create_with always merge rather than overwrite, not just when ↵ | Jon Leighton | 2011-01-03 | 1 | -3/+1 |
| | | | | | | | | merging two relations. If you wish to overwrite, you can do relation.create_with(nil), or for a specific attribute, relation.create_with(:attr => nil). | ||||
* | | Let AssociationCollection#find use #scoped to do its finding. Note that I am ↵ | Jon Leighton | 2011-01-03 | 1 | -1/+1 |
| | | | | | | | | removing test_polymorphic_has_many_going_through_join_model_with_disabled_include, since this specifies different behaviour for an association than for a regular scope. It seems reasonable to expect scopes and association proxies to behave in roughly the same way rather than having subtle differences. | ||||
* | | Specify the STI type condition using SQL IN rather than a whole load of ORs. ↵ | Jon Leighton | 2010-12-31 | 1 | -1/+5 |
|/ | | | | Required a fix to ActiveRecord::Relation#merge for properly merging create_with_value. This also fixes a situation where the type condition was appearing twice in the resultant SQL query. | ||||
* | making relationship merge cheaper | Aaron Patterson | 2010-11-30 | 1 | -3/+4 |
| | |||||
* | only returning where values for the corresponding relation, also filtering ↵ | Aaron Patterson | 2010-10-30 | 1 | -4/+5 |
| | | | | where value hash based on table name [#5234 state:resolved] [#5184 state:resolved] | ||||
* | no need to merge where values if no new where values have been added | Aaron Patterson | 2010-10-30 | 1 | -11/+13 |
| | |||||
* | reduce duplicate where removal to one loop | Aaron Patterson | 2010-10-20 | 1 | -15/+13 |
| | |||||
* | swap out some n^2 for some n | Aaron Patterson | 2010-10-19 | 1 | -7/+13 |
| | |||||
* | dup rather than create so many arrays | Aaron Patterson | 2010-10-19 | 1 | -2/+2 |
| | |||||
* | use array math rather than looping through the array | Aaron Patterson | 2010-10-19 | 1 | -1/+1 |
| | |||||
* | reorder removed in favor of except(:order).order | Santiago Pastorino | 2010-10-11 | 1 | -10/+1 |
| | |||||
* | intersection between a relation and an array works in both directions | Marcelo Giorgi | 2010-09-10 | 1 | -0/+1 |
| | | | | Signed-off-by: Mikel Lindsaar <raasdnil@gmail.com> | ||||
* | Refactor finder conditions look up and assigment for apply_finder_conditions. | Emilio Tagua | 2010-09-09 | 1 | -13/+7 |
| | |||||
* | Refactor Relation#only. No need to go through every option and test it. | Emilio Tagua | 2010-09-09 | 1 | -8/+6 |
| | |||||
* | No need to go through every option and test it, just don't add skipped ones. | Emilio Tagua | 2010-09-09 | 1 | -4/+4 |
| | |||||
* | Make scoped reorder override previous applied orders | Santiago Pastorino | 2010-09-05 | 1 | -1/+10 |
| | | | | [5528 state:committed] | ||||
* | order should always be concatenated. | Neeraj Singh | 2010-09-05 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | | | order that is declared first has highest priority in all cases. Here are some examples. Car.order('name desc').find(:first, :order => 'id').name Car.named_scope_with_order.named_scope_with_another_order Car.order('id DESC').scoping do Car.find(:first, :order => 'id asc') end No special treatment to with_scope or scoping. Also note that if default_scope declares an order then the order declared in default_scope has the highest priority unless with_exclusive_scope is used. Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | Change relation merging to always append select, group and order values | Pratik Naik | 2010-08-31 | 1 | -7/+10 |
| | |||||
* | PERF: Avoid two method calls | Santiago Pastorino | 2010-08-28 | 1 | -1/+1 |
| | |||||
* | Deletes trailing whitespaces (over text files only find * -type f -exec sed ↵ | Santiago Pastorino | 2010-08-14 | 1 | -1/+1 |
| | | | | 's/[ \t]*$//' -i {} \;) | ||||
* | avoid direct use of arel constants | Aaron Patterson | 2010-08-13 | 1 | -2/+4 |
| | |||||
* | Ensure we can nest include calls [#5285 state:resolved] | Neeraj Singh | 2010-08-12 | 1 | -1/+7 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | avoid multiple hash lookups | Aaron Patterson | 2010-08-11 | 1 | -2/+6 |
| | |||||
* | array subtraction should be faster than iterating over all the elements | Neeraj Singh | 2010-06-29 | 1 | -1/+1 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Fix unintuitive behavior with multiple order and group clauses | Ernie Miller | 2010-05-06 | 1 | -1/+6 |
| | | | | | | [#4545 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Add Relation extensions | Pratik Naik | 2010-04-02 | 1 | -4/+7 |
| | |||||
* | Consistency when using Relation constants | Pratik Naik | 2010-04-02 | 1 | -2/+2 |
| | |||||
* | adds missing requires for Object#blank? and Object#present? | Xavier Noria | 2010-03-28 | 1 | -0/+2 |
| | |||||
* | Refactor relation merging to create just one relation and then assign ↵ | Emilio Tagua | 2010-03-25 | 1 | -22/+14 |
| | | | | values, instead of creating multiple relation objects. | ||||
* | removing spawn from SpawnMethods | Aaron Patterson | 2010-03-10 | 1 | -6/+2 |
| | | | | Signed-off-by: wycats <wycats@gmail.com> | ||||
* | Relation#spawn is basically clone + reset | Pratik Naik | 2010-01-21 | 1 | -12/+2 |
| | |||||
* | Delegate all finders to Relation | Pratik Naik | 2010-01-20 | 1 | -13/+6 |
| | |||||
* | Dont check for class equaity when merging relations | Pratik Naik | 2010-01-18 | 1 | -4/+0 |
| | |||||
* | Inherit named scope class Scope from Relation | Pratik Naik | 2010-01-18 | 1 | -3/+3 |
| | |||||
* | Make relations work as scopes | Pratik Naik | 2010-01-17 | 1 | -3/+7 |
| | |||||
* | Make merging of order values consistent | Pratik Naik | 2010-01-17 | 1 | -1/+1 |
| | |||||
* | Improve the error message for class mismatch on Relation#merge | Pratik Naik | 2010-01-17 | 1 | -1/+3 |
| | |||||
* | Make sure Model#active_relation always adds STI conditions if needed | Pratik Naik | 2010-01-16 | 1 | -1/+3 |
| | |||||
* | Add Relation#apply_finder_options for applying old finder options | Pratik Naik | 2010-01-16 | 1 | -0/+23 |
| | |||||
* | Make scopes use relations under the hood | Pratik Naik | 2010-01-16 | 1 | -7/+21 |
| | |||||
* | Delay building arel relation as long as possible for improved introspection | Pratik Naik | 2010-01-12 | 1 | -48/+41 |
| | |||||
* | Add Relation#create_with to explictily specify create scope | Pratik Naik | 2010-01-04 | 1 | -0/+10 |
| | |||||
* | Relation#merge and Relation#except should respect locks | Pratik Naik | 2010-01-03 | 1 | -1/+3 |
| |