aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Collapse)AuthorAgeFilesLines
...
| * Pluck on NullRelation accepts a list of columnsDerek Prior2013-10-151-1/+1
| | | | | | | | | | | | `pluck` was updated to accept a list of columns, but the `NullRelation` was never updated to match that signature. As a result, calling `pluck` on a `NullRelation` results in an `ArgumentError`.
* | Merge branch 'master' into joindepAaron Patterson2013-10-1515-81/+90
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 sendingAaron Patterson2013-10-141-1/+3
| |
| * simplify populating the ordering hashAaron Patterson2013-10-141-10/+5
| |
| * the preloader for the RHS has all the preloaded records, so ask itAaron Patterson2013-10-141-3/+3
| |
| * only calculate offset index once. #12537Aaron Patterson2013-10-141-6/+10
| |
| * Merge pull request #10538 from neerajdotname/3882Rafael Mendonça França2013-10-141-1/+1
| |\ | | | | | | scope_chain should not be mutated for other reflections
| | * scope_chain should not be mutated for other reflectionsNeeraj Singh2013-10-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently `scope_chain` uses same array for building different `scope_chain` for different associations. During processing these arrays are sometimes mutated and because of in-place mutation the changed `scope_chain` impacts other reflections. Fix is to dup the value before adding to the `scope_chain`. Fixes #3882.
| * | Merge pull request #12527 from vipulnsward/sqlite_database_typesRafael Mendonça França2013-10-141-18/+16
| |\ \ | | |/ | |/| SQLite3 Adapter datatypes cleanup
| | * Remove `default_primary_key_type` and extract contains of ↵Vipul A M2013-10-141-18/+16
| | | | | | | | | | | | `native_database_types` to a constant since they aren't conditional now in SQLite3Adapter. Makes it more like other adapters.
| * | Merge pull request #9499 from ↵Rafael Mendonça França2013-10-141-2/+6
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | dmitry/inverse_instance_should_not_be_reloaded_after_stale_state_change Inversed instance should not be reloaded after stale state was changed Conflicts: activerecord/CHANGELOG.md
| | * add inversed accessor to association classDmitry Polushkin2013-10-131-2/+3
| | |
| | * inversed instance should not be reloaded after stale state was changedDmitry Polushkin2013-10-131-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 #11833 from vipulnsward/remove_autoincrementRafael Mendonça França2013-10-141-10/+1
| |\ \ | | | | | | | | Remove sqlite specific`supports_autoincrement?` which defaults to true
| | * | Remove sqlite specific`supports_autoincrement?` which always defaults to trueVipul A M2013-08-101-10/+1
| | | |
| * | | Extract a function to determine if the default value is a functionRafael Mendonça França2013-10-141-1/+5
| | | |
| * | | Push default_function to superclass to avoid method checkRafael Mendonça França2013-10-143-15/+18
| | | |
| * | | Dump the default function when the primary key is uuidRafael Mendonça França2013-10-141-0/+1
| | | | | | | | | | | | | | | | 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-134-19/+16
| |\ \ \ | | | | | | | | | | `Relation#count` doesn't use options anymore.
| | * | | Stop accepting `options` for `Relation#average`, `Relation#minimum`, ↵Vipul A M2013-10-142-11/+11
| | | | | | | | | | | | | | | | | | | | `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-131-2/+12
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-131-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #12511 from ↵Rafael Mendonça França2013-10-131-3/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | jetthoughts/informative_raise_message_for_incorrect_association Make missed association exception message more informative
| | * | | | | Make missed association exception message more informativePaul Nikitochkin2013-10-131-3/+3
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | 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-121-1/+1
| |\ \ \ \ | | |/ / / | |/| | | Includes with persistent select, fixes #11773
| | * | | Fixes #11773 when using includes combined with select, the select statement ↵Edo Balvers2013-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | was overwritten.
* | | | | move column_names_with_alias on to the alias cache objectAaron Patterson2013-10-144-37/+22
| | | | |
* | | | | 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