aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Don't remove the select values to add they back againRafael Mendonça França2013-10-151-1/+1
* Merge pull request #12547 from derekprior/dp-fix-null-relation-pluckRafael Mendonça França2013-10-153-2/+9
|\
| * Pluck on NullRelation accepts a list of columnsDerek Prior2013-10-153-2/+9
* | grammar fix (reverted in e9a1ecd)Vijay Dev2013-10-151-1/+1
|/
* read the association instead of sendingAaron Patterson2013-10-141-1/+3
* we should have unique sponsorable ids in the fixtures at leastAaron Patterson2013-10-141-1/+1
* 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-149-1/+65
|\
| * scope_chain should not be mutated for other reflectionsNeeraj Singh2013-10-149-1/+65
* | 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-143-2/+24
|\ \ | |/ |/|
| * Add a note to the changelog for #9499Dmitry Polushkin2013-10-131-0/+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-132-2/+17
* | Merge pull request #11833 from vipulnsward/remove_autoincrementRafael Mendonça França2013-10-142-15/+3
|\ \
| * | Remove sqlite specific`supports_autoincrement?` which always defaults to trueVipul A M2013-08-102-15/+3
* | | cleanup changelog entry format. [ci skip]Yves Senn2013-10-141-2/+4
* | | 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-142-2/+3
* | | 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-135-20/+17
|\ \ \
| * | | Stop accepting `options` for `Relation#average`, `Relation#minimum`, `Relatio...Vipul A M2013-10-143-12/+12
| * | | `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-134-2/+40
|\ \ \ \
| * | | | Generate subquery for Relation passed as array condition for wherePaul Nikitochkin2013-10-134-2/+40
* | | | | Merge pull request #12456 from razielgn/ar-test-fixesRafael Mendonça França2013-10-133-5/+11
|\ \ \ \ \
| * | | | | Allow methods arity below -1 in assert_responds.Federico Ravasio2013-10-081-3/+4
| * | | | | Assert presence of "frozen" in error message, not the full MRI message.Federico Ravasio2013-10-081-1/+3
| * | | | | Just change ENV and restore it afterwards.Federico Ravasio2013-10-071-1/+4
* | | | | | Merge pull request #12511 from jetthoughts/informative_raise_message_for_inco...Rafael Mendonça França2013-10-132-3/+9
|\ \ \ \ \ \
| * | | | | | Make missed association exception message more informativePaul Nikitochkin2013-10-132-3/+9
| | |/ / / / | |/| | | |
* | | | | | 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
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fixes #11773 when using includes combined with select, the select statement w...Edo Balvers2013-10-083-1/+15
* | | | | 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