Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | 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 | 5 | -20/+17 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | `Relation#count` doesn't use options anymore. | |||||
| | * | | | | | Stop accepting `options` for `Relation#average`, `Relation#minimum`, ↵ | Vipul A M | 2013-10-14 | 3 | -12/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | `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 | 4 | -2/+40 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 4 | -2/+40 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #12456 from razielgn/ar-test-fixes | Rafael Mendonça França | 2013-10-13 | 3 | -5/+11 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fixed MRI dependent stuff in AR tests | |||||
| | * | | | | | | | Allow methods arity below -1 in assert_responds. | Federico Ravasio | 2013-10-08 | 1 | -3/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Every method from MRI's core classes is written in C. This means Method#arity always returns -1 for methods with a variable number of arguments. This is not the case with Rubinius, where, for example Array#slice! is implemented in Ruby and has arity -2, since is defined as def slice!(start, length = undefined) | |||||
| | * | | | | | | | Assert presence of "frozen" in error message, not the full MRI message. | Federico Ravasio | 2013-10-08 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related to all the other issues regarding message independent assertions to make Rails compatible with other Ruby implementations other than MRI. The best way here would be to have a specific error raised when modifying frozen objects, like FrozenObjectError or something. But since Ruby doesn't provide such a thing, we must limit the assertion to the lowest common denominator, which is word "frozen". | |||||
| | * | | | | | | | Just change ENV and restore it afterwards. | Federico Ravasio | 2013-10-07 | 1 | -1/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stubbing ENV[] is not safe outside MRI. At some point after the stubbing has occurred a backtrace is printed to the ActiveSupport warning log: there Rubinius accesses ENV['RBX_NOCOLOR'] to determine if it should print the backtrace with colors or not, causing the stub to fail. Other implementations might access ENV in a different way too, we just can't predict it. The only thing we can do here is to actually set the ENV with what we want and restore it afterwards. | |||||
| * | | | | | | | | Merge pull request #12511 from ↵ | Rafael Mendonça França | 2013-10-13 | 2 | -3/+9 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -3/+9 | |
| | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 3 | -1/+15 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | Includes with persistent select, fixes #11773 | |||||
| | * | | | | | | Fixes #11773 when using includes combined with select, the select statement ↵ | Edo Balvers | 2013-10-08 | 3 | -1/+15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | was overwritten. | |||||
* | | | | | | | | move column_names_with_alias on to the alias cache object | Aaron Patterson | 2013-10-14 | 4 | -37/+22 | |
| | | | | | | | | ||||||
* | | | | | | | | this method does not exist anymore | Aaron Patterson | 2013-10-14 | 1 | -8/+0 | |
| | | | | | | | | ||||||
* | | | | | | | | keep a cache on the alias object | Aaron Patterson | 2013-10-14 | 3 | -17/+22 | |
| | | | | | | | | ||||||
* | | | | | | | | 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 | 2 | -5/+20 | |
| | | | | | | | | ||||||
* | | | | | | | | 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 | |
| | | | | | | | | ||||||
* | | | | | | | | eliminate single use method | Aaron Patterson | 2013-10-13 | 1 | -6/+3 | |
| | | | | | | | | ||||||
* | | | | | | | | eliminate duplicate code from to_sql | Aaron Patterson | 2013-10-13 | 2 | -7/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I don't really like passing the block, but this seems easiest for now | |||||
* | | | | | | | | calling construct_relation_for_association_find is no longer necessary | Aaron Patterson | 2013-10-13 | 1 | -1/+1 | |
| | | | | | | | | ||||||
* | | | | | | | | push up `select` exclusion | Aaron Patterson | 2013-10-13 | 2 | -4/+6 | |
| | | | | | | | | ||||||
* | | | | | | | | JoinDependency will take care of making things unique | Aaron Patterson | 2013-10-13 | 1 | -1/+1 | |
| | | | | | | | | ||||||
* | | | | | | | | 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 | |
| | | | | | | |