Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | 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 | 2 | -2/+2 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' into joindep | Aaron Patterson | 2013-10-15 | 5 | -21/+24 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | |||||
| | * | | | read the association instead of sending | Aaron Patterson | 2013-10-14 | 1 | -1/+3 | |
| | | | | | ||||||
| | * | | | 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 | |
| | | | | | ||||||
| | * | | | 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 #12518 from vipulnsward/remove_count_options | Rafael Mendonça França | 2013-10-13 | 2 | -5/+3 | |
| | |\ \ \ | | | | | | | | | | | | | `Relation#count` doesn't use options anymore. | |||||
| | | * | | | `Relation#count` doesn't use options anymore. | Vipul A M | 2013-10-13 | 2 | -5/+3 | |
| | | | | | | ||||||
| | * | | | | 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 | |
| | |/ / / | ||||||
| * | | | | move column_names_with_alias on to the alias cache object | Aaron Patterson | 2013-10-14 | 4 | -37/+22 | |
| | | | | | ||||||
| * | | | | keep a cache on the alias object | Aaron Patterson | 2013-10-14 | 2 | -16/+21 | |
| | | | | | ||||||
| * | | | | move alias building to the table node | Aaron Patterson | 2013-10-14 | 2 | -8/+8 | |
| | | | | | ||||||
| * | | | | let the Table class build the ARel alias nodes | Aaron Patterson | 2013-10-14 | 1 | -4/+9 | |
| | | | | | ||||||
| * | | | | store aliases in a better structure | Aaron Patterson | 2013-10-14 | 1 | -4/+17 | |
| | | | | | ||||||
| * | | | | remove delegation to `chain` | Aaron Patterson | 2013-10-14 | 1 | -3/+1 | |
| | | | | | ||||||
| * | | | | rm JoinHelper from JoinAssociation | Aaron Patterson | 2013-10-14 | 1 | -3/+1 | |
| | | | | | ||||||
| * | | | | unhook `join_constraints` from the @tables ivar | Aaron Patterson | 2013-10-13 | 2 | -3/+3 | |
| | | | | | ||||||
| * | | | | remove delegate methods that are not used | Aaron Patterson | 2013-10-13 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | push the node->AR cache up one level | Aaron Patterson | 2013-10-13 | 2 | -16/+12 | |
| | | | | | ||||||
| * | | | | remove dead code | Aaron Patterson | 2013-10-11 | 1 | -5/+0 | |
| | | | | | ||||||
| * | | | | remove useless code | Aaron Patterson | 2013-10-11 | 1 | -24/+20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | turns out that the activerecord object will always have the same id as the row from which it was constructed | |||||
| * | | | | the parent hash keeps the records unique already | Aaron Patterson | 2013-10-11 | 1 | -4/+3 | |
| | | | | | ||||||
| * | | | | keep track of AR objects we've made as we walk the tree | Aaron Patterson | 2013-10-11 | 1 | -35/+22 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate removal code because we avoid adding duplicates as we walk the tree the first time | |||||
| * | | | | push up the loaded target checking | Aaron Patterson | 2013-10-11 | 1 | -9/+13 | |
| | | | | | ||||||
| * | | | | we always have a model now | Aaron Patterson | 2013-10-11 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | extract conditional to the caller | Aaron Patterson | 2013-10-11 | 1 | -11/+13 | |
| | | | | | ||||||
| * | | | | we always have a reflection and it is on the node | Aaron Patterson | 2013-10-11 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | fix variable name. we're constructing a model, not an association | Aaron Patterson | 2013-10-11 | 1 | -12/+12 | |
| | | | | | ||||||
| * | | | | reflections know if they are collections, so ask | Aaron Patterson | 2013-10-11 | 1 | -6/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | We don't need to poke at the macro to figure out if we should look for a cached record or not | |||||
| * | | | | belongs_to can be treated the same way as has_one | Aaron Patterson | 2013-10-11 | 1 | -12/+5 | |
| | | | | | ||||||
| * | | | | cache the primary key / typcast lookup on the stack | Aaron Patterson | 2013-10-11 | 1 | -9/+9 | |
| | | | | | ||||||
| * | | | | remove dead code / make duplicate code more obvious | Aaron Patterson | 2013-10-11 | 1 | -4/+4 | |
| | | | | | ||||||
| * | | | | pull parent and alias tacker from the nodes. | Aaron Patterson | 2013-10-11 | 4 | -20/+23 | |
| | | | | | | | | | | | | | | | | | | | | For now, we'll set the tables on the nodes manually. | |||||
| * | | | | decouple the `join_constraints` method from the parent pointer | Aaron Patterson | 2013-10-11 | 2 | -2/+8 | |
| |/ / / | ||||||
| * | | | 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 | 1 | -0/+30 | |
| | | | | | | | | | | | | | | | | Merge JoinDependency objects as outer joins | |||||
| * | | | stuff the join dependency object in the "anything goes" hash. | Aaron Patterson | 2013-10-10 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | stop splatting things back and forth | Aaron Patterson | 2013-10-10 | 1 | -1/+1 | |
| | | | |