Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | |||||
| * | | no need for Array.wrap | Aaron Patterson | 2011-02-16 | 1 | -1/+1 |
| | | | |||||
| * | | fixing whitespace problems | Aaron Patterson | 2011-02-16 | 1 | -3/+3 |
| | | | |||||
| * | | removed an unnecessary second query when passing an ActiveRecord::Relation ↵ | Steven Fenigstein | 2011-02-16 | 2 | -2/+32 |
| | | | | | | | | | | | | to a where clause. And added ability to use subselects in where clauses. | ||||
| * | | fixture methods can be overridden and super() is useful | Aaron Patterson | 2011-02-15 | 2 | -14/+32 |
| | | | |||||
| * | | fixing variable names to reflect reality | Aaron Patterson | 2011-02-15 | 1 | -11/+11 |
| | | | |||||
| * | | this is in the AR namespace, so AR must exist | Aaron Patterson | 2011-02-15 | 1 | -1/+1 |
| | | | |||||
| * | | Optimization for postgres adapter for add_column method. Set default and not ↵ | Timothy N. Tsvetkov | 2011-02-15 | 1 | -6/+10 |
| | | | | | | | | | | | | null in one query | ||||
| * | | fixing variable names, removing FixtureFile instances from test ivars | Aaron Patterson | 2011-02-15 | 2 | -21/+14 |
| | | | |||||
| * | | removing unused variable | Aaron Patterson | 2011-02-15 | 1 | -3/+1 |
| | | | |||||
| * | | fixed broken link to postgresql docs | Sergii Boiko | 2011-02-15 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | | | Fix expected queries in relation tests. | Emilio Tagua | 2011-02-15 | 1 | -2/+2 |
| | | | |||||
* | | | Don't shadow outer local variable. | Emilio Tagua | 2011-02-15 | 1 | -2/+2 |
| | | | |||||
* | | | Run tests without IdentityMap when IM=false is given. | Emilio Tagua | 2011-02-15 | 6 | -15/+23 |
| | | | |||||
* | | | Remove identity map from benchmark script. | Emilio Tagua | 2011-02-15 | 1 | -7/+0 |
| | | | |||||
* | | | Merge remote branch 'rails/master' into identity_map | Emilio Tagua | 2011-02-15 | 158 | -3075/+5503 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/examples/performance.rb activerecord/lib/active_record/association_preload.rb activerecord/lib/active_record/associations.rb 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/nested_attributes.rb activerecord/test/cases/relations_test.rb | ||||
| * | | bad tests are bad | Aaron Patterson | 2011-02-14 | 1 | -18/+0 |
| | | | |||||
| * | | remove accidental raise! | Aaron Patterson | 2011-02-14 | 1 | -1/+0 |
| | | | |||||
| * | | removing irrelevant test | Aaron Patterson | 2011-02-14 | 2 | -18/+1 |
| | | | |||||
| * | | Merge branch 'fixtures' | Aaron Patterson | 2011-02-14 | 1 | -28/+28 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fixtures: remove unused methods extract database activity out of Fixtures instances extract rows that should be inserted to a method fixtures will return a list of tables that may be effected, delete existing fixtures will delete those tables | ||||
| | * | | remove unused methods | Aaron Patterson | 2011-02-14 | 2 | -40/+0 |
| | | | | |||||
| | * | | extract database activity out of Fixtures instances | Aaron Patterson | 2011-02-14 | 1 | -7/+23 |
| | | | | |||||
| | * | | extract rows that should be inserted to a method | Aaron Patterson | 2011-02-14 | 1 | -12/+12 |
| | | | | |||||
| | * | | fixtures will return a list of tables that may be effected, delete existing ↵ | Aaron Patterson | 2011-02-14 | 2 | -6/+30 |
| | | | | | | | | | | | | | | | | fixtures will delete those tables |