aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into joindepAaron Patterson2013-10-153-3/+3
|\
| * use the cached arel tableAaron Patterson2013-10-152-2/+2
| * Don't remove the select values to add they back againRafael Mendonça França2013-10-151-1/+1
| * Pluck on NullRelation accepts a list of columnsDerek Prior2013-10-151-1/+1
* | Merge branch 'master' into joindepAaron Patterson2013-10-1515-81/+90
|\|
| * 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 reflectionsNeeraj Singh2013-10-141-1/+1
| * | Merge pull request #12527 from vipulnsward/sqlite_database_typesRafael Mendonça França2013-10-141-18/+16
| |\ \ | | |/ | |/|
| | * Remove `default_primary_key_type` and extract contains of `native_database_t...Vipul A M2013-10-141-18/+16
| * | Merge pull request #9499 from dmitry/inverse_instance_should_not_be_reloaded_...Rafael Mendonça França2013-10-141-2/+6
| |\ \ | | |/ | |/|
| | * 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
| * | Merge pull request #11833 from vipulnsward/remove_autoincrementRafael Mendonça França2013-10-141-10/+1
| |\ \
| | * | 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
| * | | 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
* | | | | 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
* | | | | 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