Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 1 | -1/+1 |
|\ | | | | | scope_chain should not be mutated for other reflections | ||||
| * | scope_chain should not be mutated for other reflections | Neeraj Singh | 2013-10-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | Currently `scope_chain` uses same array for building different `scope_chain` for different associations. During processing these arrays are sometimes mutated and because of in-place mutation the changed `scope_chain` impacts other reflections. Fix is to dup the value before adding to the `scope_chain`. Fixes #3882. | ||||
* | | Merge pull request #12527 from vipulnsward/sqlite_database_types | Rafael Mendonça França | 2013-10-14 | 1 | -18/+16 |
|\ \ | |/ |/| | SQLite3 Adapter datatypes cleanup | ||||
| * | Remove `default_primary_key_type` and extract contains of ↵ | Vipul A M | 2013-10-14 | 1 | -18/+16 |
| | | | | | | | | `native_database_types` to a constant since they aren't conditional now in SQLite3Adapter. Makes it more like other adapters. | ||||
* | | Merge pull request #9499 from ↵ | Rafael Mendonça França | 2013-10-14 | 1 | -2/+6 |
|\ \ | |/ |/| | | | | | | | | | | | | | dmitry/inverse_instance_should_not_be_reloaded_after_stale_state_change Inversed instance should not be reloaded after stale state was changed Conflicts: activerecord/CHANGELOG.md | ||||
| * | add inversed accessor to association class | Dmitry Polushkin | 2013-10-13 | 1 | -2/+3 |
| | | |||||
| * | inversed instance should not be reloaded after stale state was changed | Dmitry Polushkin | 2013-10-13 | 1 | -2/+5 |
| | | | | | | check at association reader that record is inverted and should not be reloaded because of stale was changed at target record | ||||
* | | Merge pull request #11833 from vipulnsward/remove_autoincrement | Rafael Mendonça França | 2013-10-14 | 1 | -10/+1 |
|\ \ | | | | | | | Remove sqlite specific`supports_autoincrement?` which defaults to true | ||||
| * | | Remove sqlite specific`supports_autoincrement?` which always defaults to true | Vipul A M | 2013-08-10 | 1 | -10/+1 |
| | | | |||||
* | | | Extract a function to determine if the default value is a function | Rafael Mendonça França | 2013-10-14 | 1 | -1/+5 |
| | | | |||||
* | | | Push default_function to superclass to avoid method check | Rafael Mendonça França | 2013-10-14 | 3 | -15/+18 |
| | | | |||||
* | | | Dump the default function when the primary key is uuid | Rafael Mendonça França | 2013-10-14 | 1 | -0/+1 |
| | | | | | | | | | | | | Fixes #12489 | ||||
* | | | Merge pull request #12486 from cjolly/newline-eof-structure-sql | Rafael Mendonça França | 2013-10-13 | 1 | -0/+1 |
|\ \ \ | |_|/ |/| | | newline at end of structure.sql file | ||||
| * | | newline at end of structure.sql file | Chad Jolly | 2013-10-13 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #12518 from vipulnsward/remove_count_options | Rafael Mendonça França | 2013-10-13 | 4 | -19/+16 |
|\ \ \ | | | | | | | | | `Relation#count` doesn't use options anymore. | ||||
| * | | | Stop accepting `options` for `Relation#average`, `Relation#minimum`, ↵ | Vipul A M | 2013-10-14 | 2 | -11/+11 |
| | | | | | | | | | | | | | | | | `Relation#maximum`, `Relation#calculate`, `perform_calculation`, `NullRelation#calculate` as they isn't used anymore. | ||||
| * | | | `Relation#count` doesn't use options anymore. | Vipul A M | 2013-10-13 | 3 | -8/+5 |
| | | | | |||||
* | | | | Add nodoc to method | Rafael Mendonça França | 2013-10-13 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #12508 from ↵ | Rafael Mendonça França | 2013-10-13 | 1 | -2/+12 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jetthoughts/12415_generate_subqueries_for_relation_from_binding_params Generate subquery for Relation passed as array condition for where Conflicts: activerecord/CHANGELOG.md | ||||
| * | | | | Generate subquery for Relation passed as array condition for where | Paul Nikitochkin | 2013-10-13 | 1 | -2/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of executing 2 queries for fetching records filtered by array condition with Relation, added generation of subquery to current query. This behaviour will be consistent when passes Relation as hash condition to where Closes: #12415 | ||||
* | | | | | Merge pull request #12511 from ↵ | Rafael Mendonça França | 2013-10-13 | 1 | -3/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | jetthoughts/informative_raise_message_for_incorrect_association Make missed association exception message more informative | ||||
| * | | | | | Make missed association exception message more informative | Paul Nikitochkin | 2013-10-13 | 1 | -3/+3 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | Add target class name, which should have missed association on preload, into exception message to simplify detecting problem part. | ||||
* | / / / | Drop unused iterator var | Vipul A M | 2013-10-13 | 1 | -1/+1 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #11791 from versioncontrol/includes_with_persistent_select | Rafael Mendonça França | 2013-10-12 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | Includes with persistent select, fixes #11773 | ||||
| * | | | Fixes #11773 when using includes combined with select, the select statement ↵ | Edo Balvers | 2013-10-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | was overwritten. | ||||
* | | | | no reason to do this column addition and subtraction business | Aaron Patterson | 2013-10-11 | 1 | -1/+1 |
| | | | | |||||
* | | | | refactor a little so we can remove some methods | Aaron Patterson | 2013-10-10 | 2 | -4/+1 |
| | | | | |||||
* | | | | the parent node is on the stack, so use it | Aaron Patterson | 2013-10-10 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | we don't need to walk back up the node's parents when we have the parent on the stack | ||||
* | | | | pass the parent node to the construct method | Aaron Patterson | 2013-10-10 | 1 | -7/+6 |
| | | | | |||||
* | | | | nodes do not need to be sorted | Aaron Patterson | 2013-10-10 | 1 | -1/+1 |
| | | | | |||||
* | | | | delete unused code | Aaron Patterson | 2013-10-10 | 2 | -50/+0 |
| | | | | | | | | | | | | | | | | | | | | Now that we merge trees from the top down, we don't need to search through the whole tree for particular nodes, just walk it and merge. | ||||
* | | | | merge JoinDependency as outer joins | Aaron Patterson | 2013-10-10 | 2 | -1/+31 |
| | | | | | | | | | | | | | | | | Merge JoinDependency objects as outer joins | ||||
* | | | | stuff the join dependency object in the "anything goes" hash. | Aaron Patterson | 2013-10-10 | 4 | -6/+8 |
| | | | | |||||
* | | | | stop splatting things back and forth | Aaron Patterson | 2013-10-10 | 2 | -2/+2 |
| | | | | |||||
* | | | | simplify each method. | Aaron Patterson | 2013-10-10 | 1 | -8/+2 |
| | | | | | | | | | | | | | | | | Stop writing terrible code Aaron. This is Ruby, not Scheme | ||||
* | | | | stop creating a bunch of relation objects when we can slap all the joins on ↵ | Aaron Patterson | 2013-10-09 | 2 | -8/+3 |
| | | | | | | | | | | | | | | | | at once | ||||
* | | | | Merge branch 'builder-instances' | Rafael Mendonça França | 2013-10-09 | 7 | -57/+42 |
|\ \ \ \ | |||||
| * | | | | Method visibility will not make difference here | Rafael Mendonça França | 2013-10-09 | 4 | -8/+0 |
| | | | | | |||||
| * | | | | Remove builder instances | Rafael Mendonça França | 2013-10-09 | 2 | -22/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | All the job can be done at class level so we can avoid some object allocation | ||||
| * | | | | Extract the scope building to a class method | Rafael Mendonça França | 2013-10-09 | 2 | -10/+17 |
| | | | | | |||||
| * | | | | Remove unneeded reader | Rafael Mendonça França | 2013-10-09 | 1 | -2/+0 |
| | | | | | |||||
| * | | | | Move wrap_scope to class level | Rafael Mendonça França | 2013-10-09 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Move macro to class level | Rafael Mendonça França | 2013-10-09 | 4 | -5/+5 |
| | | | | | |||||
| * | | | | Make validate_options a class method | Rafael Mendonça França | 2013-10-09 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Make valid_options a class method | Rafael Mendonça França | 2013-10-09 | 6 | -7/+7 |
| | | | | | |||||
| * | | | | Define the association extensions without need to have a builder | Rafael Mendonça França | 2013-10-09 | 2 | -14/+14 |
| | | | | | | | | | | | | | | | | | | | | instance | ||||
* | | | | | no need to to_sym | Aaron Patterson | 2013-10-09 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'tree' | Aaron Patterson | 2013-10-09 | 5 | -109/+105 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * tree: (22 commits) remove dead code add some convenient methods for avoiding array allocations hide join_constraints inside the JoinDependency object speed up match? expose the root node and call it just skip the join if it's already there speed up finding existing nodes make node search more efficient remove == so we can see where walking up parents occurs push parent up to the superclass convert JoinBase to a tree and remove the Node class names are guaranteed to be symbols eliminate function that is only used in one place we will always detect the same node, so just pass the node in we do not need to to_s the name all the time parent is guaranteed to be the same reduce number of comparisons and array allocations rename the variable to make more sense with a tree walk the tree rather than generating a hash and walking it do not convert the tree to a list just for the first node ... |