| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | | | | | | | | Revert "Optimize <association>_ids for hm:t with belongs_to source". The ↵ | Jon Leighton | 2010-12-23 | 1 | -8/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | optimisation has too many edge cases, such as when the reflection, source reflection, or through reflection has conditions, orders, etc. [#6153 state:resolved] This reverts commit 373b053dc8b99dac1abc3879a17a2bf8c30302b5. Conflicts: activerecord/lib/active_record/associations.rb | |||||
| | * | | | | | | | | | | | | When a has_many association is not :uniq, appending the same record multiple ↵ | Jon Leighton | 2010-12-23 | 2 | -3/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | times should append it to the @target multiple times [#5964 state:resolved] | |||||
| | * | | | | | | | | | | | | Fix behaviour of foo.has_many_through_association.select('custom select') ↵ | Michał Łomnicki | 2010-12-23 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [#6089 state:resolved] | |||||
| | * | | | | | | | | | | | | Fix creation of has_many through records with custom primary_key option on ↵ | Szymon Nowak | 2010-12-23 | 1 | -1/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | belongs_to [#2990 state:resolved] | |||||
| | * | | | | | | | | | | | | Don't allow a has_one association to go :through a collection association ↵ | Jon Leighton | 2010-12-23 | 2 | -0/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [#2976 state:resolved] | |||||
| | * | | | | | | | | | | | | avoid duping and new objects | Aaron Patterson | 2010-12-23 | 1 | -2/+3 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | fixed retrieval of primary key value in Ralation#insert method | Raimonds Simanovskis | 2010-12-23 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | previously primary key value was always assigned nil which caused Oracle enhanced adapter failing tests | |||||
| | * | | | | | | | | | | | | arel can escape the id, so avoid using the database connection | Aaron Patterson | 2010-12-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Arel::Table#[] always returns an attribute, so no need for || | Aaron Patterson | 2010-12-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | probably should use the some_ids variable here. o_O | Aaron Patterson | 2010-12-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | removing SQL interpolation, please use scoping and attribute conditionals as ↵ | Aaron Patterson | 2010-12-22 | 1 | -6/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a replacement | |||||
| | * | | | | | | | | | | | | use arel to compile SQL rather than build strings | Aaron Patterson | 2010-12-22 | 1 | -1/+8 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | to_sym stuff before passing it to arel | Aaron Patterson | 2010-12-22 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | build an AST rather than build SQL strings | Aaron Patterson | 2010-12-22 | 1 | -1/+10 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | returning id (for some yet to be discovered reason) | Aaron Patterson | 2010-12-20 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | define_attr_method must serialize nil correctly | Aaron Patterson | 2010-12-20 | 1 | -2/+6 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | if there is no base name, we cannot determine a primary key | Aaron Patterson | 2010-12-20 | 1 | -2/+4 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | remove some lasigns | Aaron Patterson | 2010-12-20 | 1 | -6/+6 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | no use for set, no need to to_ary, reduce extra objects | Aaron Patterson | 2010-12-20 | 1 | -3/+2 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | use array arithmetic rather than create sets | Aaron Patterson | 2010-12-20 | 1 | -4/+2 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Avoid Symbol#to_proc for performance reasons in Ruby 1.8 | Jon Leighton | 2010-12-20 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | has_many associations with :dependent => :delete_all should update the ↵ | Jon Leighton | 2010-12-20 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | counter cache when deleting records | |||||
| | * | | | | | | | | | | | | Refactor delete_records in HasManyAssociation | Jon Leighton | 2010-12-20 | 1 | -7/+8 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Fix problem where wrong keys are used in JoinAssociation when an association ↵ | Jon Leighton | 2010-12-20 | 2 | -9/+16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | goes :through a belongs_to [#2801 state:resolved] | |||||
| | * | | | | | | | | | | | | Remove unnecessary overloaded methods create, create! and create_record from ↵ | Jon Leighton | 2010-12-20 | 1 | -18/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HasAndBelongsToManyAssociation | |||||
| | * | | | | | | | | | | | | Refactor create_record and build_record in AssociationCollection | Jon Leighton | 2010-12-20 | 1 | -17/+5 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Delete create, create! and create_record from HasManyThroughAssociation in ↵ | Jon Leighton | 2010-12-20 | 2 | -30/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | exchange for more generic versions in AssociationCollection | |||||
| | * | | | | | | | | | | | | Specify insert_record with NotImplementedError in AssociationCollection, to ↵ | Jon Leighton | 2010-12-20 | 4 | -11/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | indicate that subclasses should implement it. Also add save_record to reduce duplication. | |||||
| * | | | | | | | | | | | | | Should save without validation if autosave is enabled. | Emilio Tagua | 2010-12-20 | 1 | -2/+4 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Merge remote branch 'rails/master' into identity_map | Emilio Tagua | 2010-12-20 | 52 | -1067/+1217 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/association_proxy.rb activerecord/lib/active_record/autosave_association.rb activerecord/lib/active_record/base.rb activerecord/lib/active_record/persistence.rb | |||||
| | * | | | | | | | | | | | | Small changes on AD::Reloader. | José Valim | 2010-12-20 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Use AD::Reloader.to_cleanup for reloading [#2873 state:resolved] | John Firebaugh | 2010-12-20 | 1 | -5/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| | * | | | | | | | | | | | | Replace AD::Callbacks.to_prepare with AD::Reloader.to_prepare | John Firebaugh | 2010-12-20 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| | * | | | | | | | | | | | | Added ActiveRecord::Base#has_secure_password (via ↵ | David Heinemeier Hansson | 2010-12-18 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveModel::SecurePassword) to encapsulate dead-simple password usage with SHA2 encryption and salting | |||||
| | * | | | | | | | | | | | | Generate add_index by default when giving type belongs_to or references | Santiago Pastorino | 2010-12-16 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | ActiveRecord::Base.joins should allow single nil argument [#6181 state:resolved] | Piotr Sarnacki | 2010-12-16 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Fix various issues with the :primary_key option in :through associations ↵ | Jon Leighton | 2010-12-15 | 2 | -18/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [#2421 state:resolved] | |||||
| | * | | | | | | | | | | | | Fix problem with duplicated records when a :uniq :through association is ↵ | Jon Leighton | 2010-12-15 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | preloaded [#2447 state:resolved] | |||||
| | * | | | | | | | | | | | | dry up compute type in attribute | Aaron Patterson | 2010-12-15 | 1 | -16/+10 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Replace rudimentary named_scope with scope. [#6052 state:resolved] | Pavel Gorbokon | 2010-12-15 | 2 | -10/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rename method names (actually in tests) * rename instance variable @_named_scopes_cache to @_scopes_cache * rename references in doc comments * don't touch CHANGELOG :) | |||||
| | * | | | | | | | | | | | | to_xml doesn't work in such case: Event.select('title as t').to_xml [#4840 ↵ | Víctor Martínez | 2010-12-15 | 1 | -2/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | state:resolved] NilClass.type is no longer defined in Ruby 1.9 and causes ActiveRecord::Base.to_xml to fail with message: undefined method `type' for nil:NilClass | |||||
| | * | | | | | | | | | | | | make sure that join nodes are uniq | Aaron Patterson | 2010-12-16 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Respect the default_scope on a join model when reading a through association | Jon Leighton | 2010-12-16 | 3 | -2/+9 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Fix hm:t to self table aliasing in construct_scope | Ernie Miller | 2010-12-16 | 1 | -2/+10 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | class names are already strings, so we do not need to call to_s on the ↵ | Aaron Patterson | 2010-12-16 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | strings that are already strings | |||||
| | * | | | | | | | | | | | | build SQL AST nodes rather than generate strings | Aaron Patterson | 2010-12-16 | 1 | -10/+8 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | construct_joins no longer needs an argument | Aaron Patterson | 2010-12-16 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | supporting arel AST nodes when building join statements | Aaron Patterson | 2010-12-16 | 2 | -18/+32 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | just copy the joins to the list | Aaron Patterson | 2010-12-16 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | bucketing based on join type | Aaron Patterson | 2010-12-16 | 1 | -8/+17 | |
| | | | | | | | | | | | | | | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Eilertsens Kodeknekkeri |
| aboutsummaryrefslogtreecommitdiffstats |