Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |||||
* | merges docrails | Xavier Noria | 2011-02-18 | 3 | -6/+3 |
|\ | |||||
| * | 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 | 2 | -2/+2 |
| | | |||||
* | | Merge remote branch 'rails/master' into identity_map | Emilio Tagua | 2011-02-18 | 1 | -1/+1 |
|\ \ | |||||
| * | | just use the list of column names to generate attribute methods | Aaron Patterson | 2011-02-18 | 1 | -1/+1 |
| | | | |||||
* | | | 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 |
| | | | |||||
* | | | Reindent and remove wrong line left in merge by mistake. | Emilio Tagua | 2011-02-18 | 1 | -4/+3 |
| | | | |||||
* | | | Merge remote branch 'rails/master' into identity_map | Emilio Tagua | 2011-02-18 | 21 | -609/+692 |
|\| | | | | | | | | | | | | | | | | | 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 | 15 | -350/+361 |
| | | | | | | | | | | | | 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 | 2 | -11/+77 |
| | | | | | | | | | | | | 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 | 2 | -2/+9 |
| | | | | | | | | | | | | 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 | 1 | -10/+1 |
| | | | |||||
| * | | 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 |
| | | | |||||
| * | | removed an unnecessary second query when passing an ActiveRecord::Relation ↵ | Steven Fenigstein | 2011-02-16 | 1 | -1/+4 |
| | | | | | | | | | | | | 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 | 1 | -14/+17 |
| | | | |||||
| * | | 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 | 1 | -15/+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> | ||||
* | | | Don't shadow outer local variable. | Emilio Tagua | 2011-02-15 | 1 | -2/+2 |
| | | | |||||
* | | | Merge remote branch 'rails/master' into identity_map | Emilio Tagua | 2011-02-15 | 64 | -2162/+3057 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | remove accidental raise! | Aaron Patterson | 2011-02-14 | 1 | -1/+0 |
| | | | |||||
| * | | removing irrelevant test | Aaron Patterson | 2011-02-14 | 1 | -0/+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 | 1 | -35/+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 | 1 | -6/+25 |
| | | | | | | | | | | | | | | | | fixtures will delete those tables | ||||
| * | | | Merge remote branch 'jonleighton/association_fixes' | Aaron Patterson | 2011-02-14 | 11 | -90/+93 |
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * jonleighton/association_fixes: Add a transaction wrapper in add_to_target. This means that #build will now also use a transaction. IMO this is reasonable given that the before_add and after_add callbacks might do anything, and this great consistency allows us to abstract out the duplicate code from #build and #create. Inline ensure_owner_is_persisted! as it is only called from one place @target should always be an array Rename add_record_to_target_with_callbacks to add_to_target Don't pass the block through build_record Move create and create! next to build Get rid of create_record as it is not only used in one place Get rid of AssociationCollection#save_record Fix test/cases/connection_pool_test.rb for sqlite3 in-memory db Add interpolation of association conditions back in, in the form of proc { ... } rather than instance_eval-ing strings | ||||
| | * | | Add a transaction wrapper in add_to_target. This means that #build will now ↵ | Jon Leighton | 2011-02-14 | 1 | -27/+27 |
| | | | | | | | | | | | | | | | | also use a transaction. IMO this is reasonable given that the before_add and after_add callbacks might do anything, and this great consistency allows us to abstract out the duplicate code from #build and #create. | ||||
| | * | | Inline ensure_owner_is_persisted! as it is only called from one place | Jon Leighton | 2011-02-14 | 1 | -8/+4 |
| | | | | |||||
| | * | | @target should always be an array | Jon Leighton | 2011-02-14 | 1 | -1/+2 |
| | | | | |||||
| | * | | Rename add_record_to_target_with_callbacks to add_to_target | Jon Leighton | 2011-02-14 | 2 | -5/+5 |
| | | | | |||||
| | * | | Don't pass the block through build_record | Jon Leighton | 2011-02-14 | 1 | -10/+8 |
| | | | | |||||
| | * | | Move create and create! next to build | Jon Leighton | 2011-02-14 | 1 | -21/+21 |
| | | | | |||||
| | * | | Get rid of create_record as it is not only used in one place | Jon Leighton | 2011-02-14 | 1 | -8/+7 |
| | | | | |||||
| | * | | Get rid of AssociationCollection#save_record | Jon Leighton | 2011-02-14 | 5 | -26/+26 |
| | | | | |||||
| | * | | Add interpolation of association conditions back in, in the form of proc { ↵ | Jon Leighton | 2011-02-14 | 7 | -20/+29 |
| | | | | | | | | | | | | | | | | ... } rather than instance_eval-ing strings | ||||
| * | | | HabtmFixtures class is no longer needed | Aaron Patterson | 2011-02-14 | 1 | -31/+22 |
| |/ / | |||||
| * | | Remove Relation#& alias for Relation#merge | Ernie Miller | 2011-02-12 | 3 | -4/+2 |
| | | | |||||
| * | | switch over to Mysql2::Client#ping for the mysql2 connection check | Brian Lopez | 2011-02-12 | 1 | -4/+1 |
| | | | |||||
| * | | Fix table name collision due to incorrect alias count on certain joins. | Ernie Miller | 2011-02-12 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | [#6423 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> |