Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | only take the limit if there is a limit to take | Aaron Patterson | 2011-02-25 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-02-25 | 1 | -1/+1 |
|\ | |||||
| * | Fix missing inheritance from AR::Base in docs | Josep M. Bach | 2011-02-24 | 1 | -1/+1 |
| | | |||||
* | | fixes: ActiveRecord::Base.scopes includes all scopes defined in all subclasses | Eric Allam | 2011-02-24 | 2 | -2/+7 |
| | | |||||
* | | observers leak across tests, so rather than modify the object, we should ↵ | Aaron Patterson | 2011-02-23 | 1 | -6/+12 |
| | | | | | | | | just count the number of times the observer was called | ||||
* | | Fix observer callbacks firing multiple times on descendant instances | Kamal Fariz Mahyuddin | 2011-02-22 | 2 | -1/+22 |
| | | |||||
* | | We're in 2011, let's update our license | Prem Sichanugrist | 2011-02-22 | 2 | -2/+2 |
| | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | | expectations change when using IM. Change oracle tests to reflect that | Aaron Patterson | 2011-02-22 | 1 | -2/+6 |
| | | |||||
* | | Relation will delegate to AR::Base which already uses the Dynamic finders, ↵ | Aaron Patterson | 2011-02-22 | 1 | -8/+3 |
|/ | | | | so eliminate duplicate calls | ||||
* | adding a test case for custom locking | Aaron Patterson | 2011-02-21 | 1 | -0/+17 |
| | |||||
* | Use proper objects to do the work to build the associations (adding methods, ↵ | Jon Leighton | 2011-02-21 | 15 | -418/+553 |
| | | | | callbacks etc) rather than calling a whole bunch of methods with rather long names. | ||||
* | Rename target_klass to klass | Jon Leighton | 2011-02-21 | 3 | -10/+10 |
| | |||||
* | Delegate through_reflection and source_reflection to reflection | Jon Leighton | 2011-02-21 | 3 | -34/+34 |
| | |||||
* | Delegate Association#options to the reflection, and replace ↵ | Jon Leighton | 2011-02-21 | 8 | -47/+57 |
| | | | | 'reflection.options' with 'options'. Also add through_options and source_options methods for through associations. | ||||
* | Singular associations no longer use a proxy, so no need to check for the ↵ | Jon Leighton | 2011-02-21 | 3 | -8/+2 |
| | | | | proxy type on assignment. | ||||
* | Associations - where possible, call attributes methods rather than directly ↵ | Jon Leighton | 2011-02-21 | 11 | -179/+179 |
| | | | | accessing the instance variables | ||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-02-21 | 4 | -4/+28 |
|\ | |||||
| * | copy-edits 8d96b89 | Xavier Noria | 2011-02-21 | 2 | -8/+10 |
| | | |||||
| * | Adding new examples for update_all method | Rodrigo Navarro | 2011-02-20 | 1 | -0/+6 |
| | | |||||
| * | Adding examples | Rodrigo Navarro | 2011-02-20 | 1 | -0/+2 |
| | | |||||
| * | Tpyo: fixing several cases of the the | Nicholas Rowe | 2011-02-19 | 1 | -1/+1 |
| | | |||||
| * | Typo: fixing the the | Nicholas Rowe | 2011-02-19 | 1 | -1/+1 |
| | | |||||
| * | Clarification of ActiveRecord ActiveModel validation documentation | Peer Allan | 2011-02-18 | 2 | -2/+16 |
| | | |||||
* | | instance_methods includes public and protected, so reduce funcalls and ↵ | Aaron Patterson | 2011-02-18 | 1 | -3/+2 |
| | | | | | | | | object allocs | ||||
* | | oops, no need for puts! | Aaron Patterson | 2011-02-18 | 1 | -1/+0 |
| | | |||||
* | | AR::AttributeMethods does not need to be included in an AR::Base class. | Aaron Patterson | 2011-02-18 | 2 | -1/+67 |
| | | |||||
* | | fixes a merge conflict | Xavier Noria | 2011-02-19 | 1 | -10/+0 |
|/ | |||||
* | merges docrails | Xavier Noria | 2011-02-18 | 5 | -9/+16 |
|\ | |||||
| * | removes unrealistic example (authentication plus gender?), that it is not ↵ | Xavier Noria | 2011-02-18 | 1 | -4/+1 |
| | | | | | | | | needed anyway | ||||
| * | Clarify Example in ActiveRecord base | Nicholas Rowe | 2011-02-18 | 1 | -1/+1 |
| | | |||||
| * | Fix Typos: remove several occurences of the the | Nicholas Rowe | 2011-02-17 | 3 | -3/+3 |
| | | |||||
| * | commas to set off expressions that interrupt sentence flow | genlinux | 2011-02-17 | 1 | -3/+3 |
| | | |||||
* | | Merge remote branch 'rails/master' into identity_map | Emilio Tagua | 2011-02-18 | 2 | -9/+1 |
|\ \ | |||||
| * | | Remove test which was broken on 1.8. This test is now irrelevant since ↵ | Jon Leighton | 2011-02-18 | 1 | -8/+0 |
| | | | | | | | | | | | | singular associations no longer return a proxy object. | ||||
| * | | just use the list of column names to generate attribute methods | Aaron Patterson | 2011-02-18 | 1 | -1/+1 |
| | | | |||||
* | | | Don't use skip, just don't run anything, we don't have skip in Ruby 1.8 | Emilio Tagua | 2011-02-18 | 2 | -8/+4 |
| | | | |||||
* | | | No need to have reinit_with inside an InstanceMethods module. | Emilio Tagua | 2011-02-18 | 1 | -17/+15 |
| | | | |||||
* | | | Initialize @target instead asking if it is defined. | Emilio Tagua | 2011-02-18 | 1 | -1/+2 |
| | | | |||||
* | | | Should use "=" instead "replace" after this commit: ↵ | Emilio Tagua | 2011-02-18 | 1 | -1/+1 |
| | | | | | | | | | | | | 1644663ba7f678d178deab2bf1629dc05626f85b | ||||
* | | | No need to test agaisnt target. | Emilio Tagua | 2011-02-18 | 1 | -1/+1 |
| | | | |||||
* | | | Reindent and remove wrong line left in merge by mistake. | Emilio Tagua | 2011-02-18 | 1 | -4/+3 |
| | | | |||||
* | | | Use to_a instead :load in test, since :load changed. | Emilio Tagua | 2011-02-18 | 1 | -1/+1 |
| | | | |||||
* | | | No need to test against target anymore. | Emilio Tagua | 2011-02-18 | 1 | -8/+8 |
| | | | |||||
* | | | Merge remote branch 'rails/master' into identity_map | Emilio Tagua | 2011-02-18 | 38 | -771/+833 |
|\| | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/association.rb activerecord/lib/active_record/fixtures.rb | ||||
| * | | Split AssociationProxy into an Association class (and subclasses) which ↵ | Jon Leighton | 2011-02-18 | 26 | -502/+392 |
| | | | | | | | | | | | | manages the association, and a CollectionProxy class which is *only* a proxy. Singular associations no longer have a proxy. See CHANGELOG for more. | ||||
| * | | Add :nodoc: to ThroughAssociation and HasOneAssociation | Jon Leighton | 2011-02-18 | 2 | -2/+2 |
| | | | |||||
| * | | Allow building and then later saving has_many :through records, such that ↵ | Jon Leighton | 2011-02-18 | 7 | -12/+124 |
| | | | | | | | | | | | | the join record is automatically saved too. This requires the :inverse_of option to be set on the source association in the join model. See the CHANGELOG for details. [#4329 state:resolved] | ||||
| * | | Ensure that association_ids uses the correct attribute where the association ↵ | Jon Leighton | 2011-02-18 | 4 | -2/+20 |
| | | | | | | | | | | | | is a has_many :through with a :primary_key option on the source reflection. [#6376 state:resolved] | ||||
| * | | explicitly allowing lolqueries | Aaron Patterson | 2011-02-16 | 2 | -13/+11 |
| | | | |||||
| * | | use the arel table rather than generating strings | Aaron Patterson | 2011-02-16 | 1 | -1/+1 |
| | | |