aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #12486 from cjolly/newline-eof-structure-sqlRafael Mendonça França2013-10-131-0/+1
|\
| * 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-134-19/+16
|\ \
| * | Stop accepting `options` for `Relation#average`, `Relation#minimum`, `Relatio...Vipul A M2013-10-142-11/+11
| * | `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 jetthoughts/12415_generate_subqueries_for_rela...Rafael Mendonça França2013-10-131-2/+12
|\ \ \
| * | | Generate subquery for Relation passed as array condition for wherePaul Nikitochkin2013-10-131-2/+12
* | | | Merge pull request #12511 from jetthoughts/informative_raise_message_for_inco...Rafael Mendonça França2013-10-131-3/+3
|\ \ \ \
| * | | | Make missed association exception message more informativePaul Nikitochkin2013-10-131-3/+3
| |/ / /
* | / / 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-121-1/+1
|\ \ \ | |/ / |/| |
| * | Fixes #11773 when using includes combined with select, the select statement w...Edo Balvers2013-10-081-1/+1
* | | 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
* | | 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
* | | merge JoinDependency as outer joinsAaron Patterson2013-10-102-1/+31
* | | 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 creating a bunch of relation objects when we can slap all the joins on a...Aaron Patterson2013-10-092-8/+3
* | | Merge branch 'builder-instances'Rafael Mendonça França2013-10-097-57/+42
|\ \ \
| * | | 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
| * | | 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-092-14/+14
* | | | no need to to_symAaron Patterson2013-10-091-1/+1
* | | | Merge branch 'tree'Aaron Patterson2013-10-095-109/+105
|\ \ \ \ | |_|_|/ |/| | |
| * | | 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
| * | | speed up finding existing nodesAaron Patterson2013-10-091-3/+1
| * | | make node search more efficientAaron Patterson2013-10-094-3/+43
| * | | remove == so we can see where walking up parents occursAaron Patterson2013-10-094-25/+15
| * | | push parent up to the superclassAaron Patterson2013-10-093-7/+11
| * | | convert JoinBase to a tree and remove the Node classAaron Patterson2013-10-092-42/+30
| * | | names are guaranteed to be symbolsAaron Patterson2013-10-081-1/+1
| * | | eliminate function that is only used in one placeAaron Patterson2013-10-081-7/+2
| * | | we will always detect the same node, so just pass the node inAaron Patterson2013-10-081-7/+2