aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations
Commit message (Expand)AuthorAgeFilesLines
* remove warning: assigned but unused variableSantiago Pastorino2011-06-081-1/+1
* Allow polymorphic has_one to work when the association is set before the owne...Jon Leighton2011-06-081-3/+1
* When you add a record to a polymorphic has_one, you should be able to access ...Jon Leighton2011-06-082-2/+2
* Don't double assign attributes - closes #1467.Andrew White2011-06-031-1/+0
* added an alias for new to build to the AR collection proxy, this corrects an ...Josh Kalderimis2011-06-012-10/+2
* Only save the record once when calling create! on a collection association. F...Jon Leighton2011-05-314-25/+45
* Implementing @dmathieu's cleaner fix from #1425. Unfortunately he deleted the...Jon Leighton2011-05-311-8/+5
* Adding comment to work with 1.8.7. Nested Attribute fix.Arun Agrawal2011-05-311-0/+3
* Fix nested attribute for memory record.Arun Agrawal2011-05-311-1/+5
* Merge pull request #1323 from fx/association_primary_keyJon Leighton2011-05-261-1/+1
|\
| * use association_primary_key in AssociationScope#add_constraintsMarian Rudzynski2011-05-261-1/+1
* | Removes the restriction on primary key when joining in a habtm && test that i...Mohammad El-Abid2011-05-261-4/+0
|/
* Merge branch 'master' of github.com:rails/railsXavier Noria2011-05-252-37/+0
|\
| * removed deprecated methods, and related tests, from ActiveRecordJosh Kalderimis2011-05-252-37/+0
* | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-252-2/+2
|\ \ | |/ |/|
| * Remove extra white spaces on ActiveRecord docs.Sebastian Martinez2011-05-232-2/+2
* | Ignore :includes on through associationsAndrew White2011-05-241-1/+1
* | Fix problem with loading polymorphic associations which have been defined in ...Jon Leighton2011-05-222-8/+22
* | Handle polymorphic_type NOT NULL-able columns as well.thedarkone2011-05-211-1/+1
* | AliasTracker.pluralize use pluralize_table_names of modelGuillermo Iguaran2011-05-202-3/+3
* | Implement proxy_owner, proxy_target and proxy_reflection methods on Collectio...Jon Leighton2011-05-191-0/+24
|/
* Don't pass a block as we are yieldingAndrew White2011-05-171-1/+1
* Add block setting of attributes to singular associationsAndrew White2011-05-172-11/+12
* Pass the attribute and option hashes to build_associationAndrew White2011-05-172-8/+12
* Merge pull request #560 from guilleiguaran/fix_pluralize_table_names_falseJon Leighton2011-05-161-1/+1
|\
| * Fixing has_many association when ActiveRecord::Base.pluralize_table_names is ...Guillermo Iguaran2011-05-151-1/+1
* | These extra array operations appear to be unnecessary. Reasoning:Jon Leighton2011-05-141-8/+2
* | CollectionAssociation#merge_target_lists should write to the underlying attri...Jon Leighton2011-05-141-5/+2
* | An attempt to make CollectionAssociation#merge_target_lists make more sense.Jon Leighton2011-05-141-16/+35
|/
* Instead of doing find(:all) which does scoped.find(:all) which does scoped.al...Jon Leighton2011-05-131-1/+1
* Remove pointless rescue (it doesn't happen anywhere in the tests, and I can't...Jon Leighton2011-05-131-9/+1
* Don't use mass-assignment protection when setting foreign keys or association...Jon Leighton2011-05-121-9/+9
* Don't remove the target if it has already been destroyedAndrew White2011-05-111-1/+1
* Modified CollectionAssociation to refer to the new class name.Michael Ebens2011-05-111-1/+1
* Don't use select() values from the join model of a through association. Fixes...Jon Leighton2011-05-111-3/+4
* Bring back obj.association_loaded? as a deprecated method. Fixes #472.Jon Leighton2011-05-111-0/+13
* Remove unnecessary '|| {}'Jon Leighton2011-05-101-1/+1
* Don't use mass-assignment protection when applying the scoped.scope_for_creat...Jon Leighton2011-05-102-3/+7
* Fix #480. Passing nil to create association works.José Valim2011-05-101-1/+1
* Revert "b9ea751d0e56bd00d341766977a607ed3f7ddd0f".José Valim2011-05-101-26/+27
* Merge pull request #399 from ernie/join_conditions_on_joinJon Leighton2011-05-051-3/+3
|\
| * Add join conditions to JOIN clause, not WHEREErnie Miller2011-05-051-3/+3
* | Merge pull request #358 from baroquebobcat/fix_find_or_create_masterAaron Patterson2011-05-051-3/+6
|\ \ | |/ |/|
| * Fix for lighthouse #6741Nick Howard2011-05-011-3/+6
* | singular and collection relations in AR can now specify mass-assignment secur...Josh Kalderimis2011-05-013-20/+20
|/
* Extract the constraint-building for joins in JoinAssociation into a separate ...Jon Leighton2011-04-141-8/+14
* Remove `#among?` from Active SupportPrem Sichanugrist2011-04-135-5/+5
* Removing the scope-caching which happens on association proxies, because the ...Jon Leighton2011-04-122-14/+0
* Change Object#either? to Object#among? -- thanks to @jamesarosen for the sugg...David Heinemeier Hansson2011-04-125-5/+5
* Using Object#in? and Object#either? in various placesPrem Sichanugrist2011-04-115-5/+14