aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | | Change `map` to `map!` to save extra array creation on new arrayVipul A M2013-10-131-1/+1
| | | |_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge pull request #12516 from vipulnsward/drop_varRafael Mendonça França2013-10-131-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | Drop unused iterator var
| | * | | | | | | | | | | | | | 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.
| * | | | | | | | | | | | | | | Merge pull request #12507 from malavbhavsar/doc_patchRafael Mendonça França2013-10-122-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some fixes in docs [ci skip]
| | * | | | | | | | | | | | | | | Some fixes in docs [ci skip]Malav Bhavsar2013-10-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update a link to point to right section in api docs Fix a typo
| * | | | | | | | | | | | | | | | Merge pull request #12512 from sbagdat/patch-1Andrew White2013-10-121-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | Fix a writing mistake
| | * | | | | | | | | | | | | | | Fix a writing mistakeSıtkı Bağdat2013-10-121-1/+1
| |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A small mistake found in the line of ```The default error is "can't be empty"``` for ```:presence``` helper. ```empty``` word changed to ```blank```.
| * | | | | | | | | | | | | | | Revert "Merge pull request #12480 from iwiznia/master"Jeremy Kemper2013-10-114-57/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e5f5a838b96a362534d9bb60d02334439ed9784c, reversing changes made to d7567f3290a50952494e9213556a1f283a6cf3a0.
* | | | | | | | | | | | | | | | move column_names_with_alias on to the alias cache objectAaron Patterson2013-10-144-37/+22
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | this method does not exist anymoreAaron Patterson2013-10-141-8/+0
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | keep a cache on the alias objectAaron Patterson2013-10-143-17/+22
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | move alias building to the table nodeAaron Patterson2013-10-142-8/+8
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | let the Table class build the ARel alias nodesAaron Patterson2013-10-141-4/+9
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | store aliases in a better structureAaron Patterson2013-10-142-5/+20
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | remove delegation to `chain`Aaron Patterson2013-10-141-3/+1
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | rm JoinHelper from JoinAssociationAaron Patterson2013-10-141-3/+1
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | unhook `join_constraints` from the @tables ivarAaron Patterson2013-10-132-3/+3
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | remove delegate methods that are not usedAaron Patterson2013-10-131-1/+1
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | push the node->AR cache up one levelAaron Patterson2013-10-132-16/+12
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | eliminate single use methodAaron Patterson2013-10-131-6/+3
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | eliminate duplicate code from to_sqlAaron Patterson2013-10-132-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 necessaryAaron Patterson2013-10-131-1/+1
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | push up `select` exclusionAaron Patterson2013-10-132-4/+6
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | JoinDependency will take care of making things uniqueAaron Patterson2013-10-131-1/+1
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | remove dead codeAaron Patterson2013-10-111-5/+0
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | remove useless codeAaron Patterson2013-10-111-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 alreadyAaron Patterson2013-10-111-4/+3
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | keep track of AR objects we've made as we walk the treeAaron Patterson2013-10-111-35/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate removal code because we avoid adding duplicates as we walk the tree the first time
* | | | | | | | | | | | | | | | push up the loaded target checkingAaron Patterson2013-10-111-9/+13
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | we always have a model nowAaron Patterson2013-10-111-1/+1
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | extract conditional to the callerAaron Patterson2013-10-111-11/+13
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | we always have a reflection and it is on the nodeAaron Patterson2013-10-111-2/+2
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | fix variable name. we're constructing a model, not an associationAaron Patterson2013-10-111-12/+12
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | reflections know if they are collections, so askAaron Patterson2013-10-111-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_oneAaron Patterson2013-10-111-12/+5
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | cache the primary key / typcast lookup on the stackAaron Patterson2013-10-111-9/+9
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | remove dead code / make duplicate code more obviousAaron Patterson2013-10-111-4/+4
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | pull parent and alias tacker from the nodes.Aaron Patterson2013-10-114-20/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For now, we'll set the tables on the nodes manually.
* | | | | | | | | | | | | | | | decouple the `join_constraints` method from the parent pointerAaron Patterson2013-10-112-2/+8
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | no reason to do this column addition and subtraction businessAaron Patterson2013-10-111-1/+1
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #12480 from iwiznia/masterRafael Mendonça França2013-10-114-0/+57
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | flatten and flatten! methods for ActiveSupport::Duration
| * | | | | | | | | | | | | | | flatten and flatten! methods for ActiveSupport::DurationIonatan Wiznia2013-10-114-0/+57
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge pull request #12503 from arunagw/removed-unused-requireRafael Mendonça França2013-10-111-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No need to require rbconfig as we are using Gem.ruby
| * | | | | | | | | | | | | | | No need to require rbconfig as we are using Gem.rubyArun Agrawal2013-10-111-1/+0
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | |