aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #13899 from Fortisque/kevin/active_record_HABTM_with_belon...Rafael Mendonça França2014-02-041-1/+1
|\
| * fix HABTM w/out primary key errors on destructionKevin Casey2014-02-021-1/+1
* | this class depends on JoinHelper, so we should require itAaron Patterson2014-01-311-0/+2
|/
* Associations now raise `ArgumentError` on name conflicts.Lauro Caetano2014-01-311-0/+6
* Make CollectionProxy#reset return selfRafael Mendonça França2014-01-221-1/+2
* Calling reset on a collection association should unload the assocationKelsey Schlarman2014-01-211-0/+21
* Ensure AR #second, #third, etc. finders work through associationsJason Meller2014-01-212-5/+51
* add missing information for `id` field when used with `select` [ci skip]Kuldeep Aggarwal2014-01-221-1/+1
* `has_one` and `belongs_to` accessors don't add ORDER BY to the queries anymore.Rafael Mendonça França2014-01-211-1/+1
* directly create the ARel ASTAaron Patterson2014-01-141-6/+4
* Change all "can not"s to the correct "cannot".T.J. Schuck2014-01-031-1/+1
* Merge pull request #10134 from derikson/collection_proxy_select_with_multiple...Rafael Mendonça França2014-01-032-5/+5
|\
| * Changed ActiveRecord::Associations::CollectionProxy#select to take multiple a...Dan Erikson2013-04-082-5/+5
* | Merge pull request #13550 from vipulnsward/13437-fixRafael Mendonça França2014-01-011-1/+1
|\ \
| * | https://github.com/rails/rails/commit/2075f39d726cef361170218fd16421fc52bed5a...Vipul A M2013-12-311-1/+1
* | | Make outer joins on proper parentWashington Luiz2013-12-311-1/+1
|/ /
* | On destroying do not touch destroyed belongs to association.Paul Nikitochkin2013-12-231-1/+1
* | Merge pull request #13417 from TalkativeTree/comments_changeRichard Schneeman2013-12-191-1/+1
|\ \
| * | change CollectionAssociation's comments to say Association instead of Associa...Ben Angel2013-12-191-1/+1
* | | Fix nil assignment to polymorphic belongs_toJeremy Kemper2013-12-181-0/+5
* | | extract cache counter logic to one methodAaron Patterson2013-12-121-11/+10
* | | remove duplicate codeAaron Patterson2013-12-121-15/+6
* | | extract a method for updating without a record objectAaron Patterson2013-12-121-6/+10
* | | extract methods out of the cache update methodAaron Patterson2013-12-121-14/+22
* | | pull a nil check up one frameAaron Patterson2013-12-121-6/+10
* | | remove more nil checksAaron Patterson2013-12-121-6/+5
* | | remove nil checkAaron Patterson2013-12-122-7/+11
* | | remove the nil check from set_inverse_instanceAaron Patterson2013-12-124-4/+7
* | | make sure cached table name is a string. fixes #12582Aaron Patterson2013-12-121-1/+1
* | | Move the parameter normalization to the initialize methodRafael Mendonça França2013-12-111-4/+5
* | | Revert the whole refactoring in the association builder classes.Rafael Mendonça França2013-12-117-46/+62
* | | Mark the arguments needed by activerecord-deprecated_finders with a TODORafael Mendonça França2013-12-112-0/+4
* | | Revert "Merge pull request #12518 from vipulnsward/remove_count_options"Rafael Mendonça França2013-12-112-3/+5
* | | Bring back the valid_options class accessorRafael Mendonça França2013-12-116-9/+14
* | | fix typo, "state_state" should be "stale_state" [ci skip]Scott M2013-12-071-1/+1
* | | polymorphic belongs_to association with touch: true updates old record correctlySeverin Schoepke2013-12-051-1/+7
* | | Raise `ArgumentError` when `has_one` is used with `counter_cache`Godfrey Chan2013-11-292-2/+2
* | | tyopAkira Matsuda2013-11-261-1/+1
* | | Raise `RecordNotDestroyed` when children can't be replacedBrian Thomas Storti2013-11-251-1/+1
* | | Merge remote-tracking branch 'docrails/master'Xavier Noria2013-11-243-15/+15
|\ \ \ | |/ / |/| |
| * | Change syntax format for example returned valuesPrem Sichanugrist2013-11-113-15/+15
* | | Merge pull request #12918 from versioncontrol/rails-12866Rafael Mendonça França2013-11-161-1/+6
|\ \ \
| * | | Checks to see if the record contains the foreign_key to set the inverse autom...Edo Balvers2013-11-161-1/+6
| |/ /
* | | Prevent the counter cache from being decremented twicedm1try2013-11-111-1/+1
* | | Fixes problem with replacing has_one association record with itselfDenis Redozubov2013-11-111-2/+4
|/ /
* | Merge pull request #12390 from kennyj/rename_to_association_methodsRafael Mendonça França2013-11-052-2/+2
|\ \
| * | Renamed generated_feature_methods to generated_association_methods.kennyj2013-09-282-2/+2
* | | Fix wrong behavior where associations with dependent: :destroy optionsRafael Mendonça França2013-11-011-4/+2
* | | Skip `include_values` from through associations chains for building target scopePaul Nikitochkin2013-10-271-2/+6
* | | Fix typo: `has_many :pets`, not `pets :has_many`.Peter Jaros2013-10-241-1/+1