aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Dump the default function when the primary key is uuidRafael Mendonça França2013-10-142-2/+3
| | | | Fixes #12489
* Merge pull request #12486 from cjolly/newline-eof-structure-sqlRafael Mendonça França2013-10-131-0/+1
|\ | | | | newline at end of structure.sql file
| * newline at end of structure.sql fileChad Jolly2013-10-131-0/+1
| |
* | Merge pull request #12518 from vipulnsward/remove_count_optionsRafael Mendonça França2013-10-135-20/+17
|\ \ | | | | | | `Relation#count` doesn't use options anymore.
| * | Stop accepting `options` for `Relation#average`, `Relation#minimum`, ↵Vipul A M2013-10-143-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 M2013-10-133-8/+5
| | |
* | | Add nodoc to methodRafael Mendonça França2013-10-131-1/+1
| | |
* | | Merge pull request #12508 from ↵Rafael Mendonça França2013-10-134-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 wherePaul Nikitochkin2013-10-134-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-fixesRafael Mendonça França2013-10-133-5/+11
|\ \ \ \ | | | | | | | | | | Fixed MRI dependent stuff in AR tests
| * | | | Allow methods arity below -1 in assert_responds.Federico Ravasio2013-10-081-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 Ravasio2013-10-081-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 Ravasio2013-10-071-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ça2013-10-132-3/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | jetthoughts/informative_raise_message_for_incorrect_association Make missed association exception message more informative
| * | | | | Make missed association exception message more informativePaul Nikitochkin2013-10-132-3/+9
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Add target class name, which should have missed association on preload, into exception message to simplify detecting problem part.
* | | | | Drop unused iterator varVipul A M2013-10-131-1/+1
| |_|/ / |/| | |
* | | | Merge pull request #11791 from versioncontrol/includes_with_persistent_selectRafael Mendonça França2013-10-123-1/+15
|\ \ \ \ | |/ / / |/| | | Includes with persistent select, fixes #11773
| * | | Fixes #11773 when using includes combined with select, the select statement ↵Edo Balvers2013-10-083-1/+15
| | | | | | | | | | | | | | | | was overwritten.
* | | | no reason to do this column addition and subtraction businessAaron Patterson2013-10-111-1/+1
| | | |
* | | | refactor a little so we can remove some methodsAaron Patterson2013-10-102-4/+1
| | | |
* | | | the parent node is on the stack, so use itAaron Patterson2013-10-101-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 methodAaron Patterson2013-10-101-7/+6
| | | |
* | | | nodes do not need to be sortedAaron Patterson2013-10-101-1/+1
| | | |
* | | | delete unused codeAaron Patterson2013-10-102-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 joinsAaron Patterson2013-10-102-1/+31
| | | | | | | | | | | | | | | | Merge JoinDependency objects as outer joins
* | | | stuff the join dependency object in the "anything goes" hash.Aaron Patterson2013-10-104-6/+8
| | | |
* | | | stop splatting things back and forthAaron Patterson2013-10-102-2/+2
| | | |
* | | | simplify each method.Aaron Patterson2013-10-101-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 Patterson2013-10-092-8/+3
| | | | | | | | | | | | | | | | at once
* | | | Merge branch 'builder-instances'Rafael Mendonça França2013-10-098-59/+43
|\ \ \ \
| * | | | Method visibility will not make difference hereRafael Mendonça França2013-10-094-8/+0
| | | | |
| * | | | Remove builder instancesRafael Mendonça França2013-10-092-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 methodRafael Mendonça França2013-10-092-10/+17
| | | | |
| * | | | Remove unneeded readerRafael Mendonça França2013-10-091-2/+0
| | | | |
| * | | | Move wrap_scope to class levelRafael Mendonça França2013-10-091-2/+2
| | | | |
| * | | | Move macro to class levelRafael Mendonça França2013-10-094-5/+5
| | | | |
| * | | | Make validate_options a class methodRafael Mendonça França2013-10-091-3/+3
| | | | |
| * | | | Make valid_options a class methodRafael Mendonça França2013-10-096-7/+7
| | | | |
| * | | | Define the association extensions without need to have a builderRafael Mendonça França2013-10-093-16/+15
| | | | | | | | | | | | | | | | | | | | instance
* | | | | no need to to_symAaron Patterson2013-10-091-1/+1
| | | | |
* | | | | Merge branch 'tree'Aaron Patterson2013-10-095-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 ...
| * | | | remove dead codeAaron Patterson2013-10-091-13/+0
| | | | |
| * | | | add some convenient methods for avoiding array allocationsAaron Patterson2013-10-092-3/+6
| | | | |
| * | | | hide join_constraints inside the JoinDependency objectAaron Patterson2013-10-092-8/+7
| | | | |
| * | | | speed up match?Aaron Patterson2013-10-091-0/+1
| | | | |
| * | | | expose the root node and call itAaron Patterson2013-10-091-21/+11
| | | | |
| * | | | just skip the join if it's already thereAaron Patterson2013-10-091-14/+10
| | | | | | | | | | | | | | | | | | | | Remove the annoying `find_or_build` stuff.
| * | | | speed up finding existing nodesAaron Patterson2013-10-091-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | The node must be a child of the parent passed in, so only search children of the parent node
| * | | | make node search more efficientAaron Patterson2013-10-094-3/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than search every node in the tree, comparing that node and all of its parents every time, start at the root from both sides and work our way down the tree
| * | | | remove == so we can see where walking up parents occursAaron Patterson2013-10-094-25/+15
| | | | |