aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | merges docrailsXavier Noria2011-02-183-6/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | removes unrealistic example (authentication plus gender?), that it is not nee...Xavier Noria2011-02-181-4/+1
| * | | | | | | | | | | | Clarify Example in ActiveRecord baseNicholas Rowe2011-02-181-1/+1
| * | | | | | | | | | | | Fix Typos: remove several occurences of the theNicholas Rowe2011-02-172-2/+2
* | | | | | | | | | | | | Merge remote branch 'rails/master' into identity_mapEmilio Tagua2011-02-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | just use the list of column names to generate attribute methodsAaron Patterson2011-02-181-1/+1
* | | | | | | | | | | | | | No need to have reinit_with inside an InstanceMethods module.Emilio Tagua2011-02-181-17/+15
* | | | | | | | | | | | | | Initialize @target instead asking if it is defined.Emilio Tagua2011-02-181-1/+2
* | | | | | | | | | | | | | Reindent and remove wrong line left in merge by mistake.Emilio Tagua2011-02-181-4/+3
* | | | | | | | | | | | | | Merge remote branch 'rails/master' into identity_mapEmilio Tagua2011-02-1821-609/+692
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Split AssociationProxy into an Association class (and subclasses) which manag...Jon Leighton2011-02-1815-350/+361
| * | | | | | | | | | | | | Add :nodoc: to ThroughAssociation and HasOneAssociationJon Leighton2011-02-182-2/+2
| * | | | | | | | | | | | | Allow building and then later saving has_many :through records, such that the...Jon Leighton2011-02-182-11/+77
| * | | | | | | | | | | | | Ensure that association_ids uses the correct attribute where the association ...Jon Leighton2011-02-182-2/+9
| * | | | | | | | | | | | | explicitly allowing lolqueriesAaron Patterson2011-02-161-10/+1
| * | | | | | | | | | | | | use the arel table rather than generating stringsAaron Patterson2011-02-161-1/+1
| * | | | | | | | | | | | | no need for Array.wrapAaron Patterson2011-02-161-1/+1
| * | | | | | | | | | | | | removed an unnecessary second query when passing an ActiveRecord::Relation to...Steven Fenigstein2011-02-161-1/+4
| * | | | | | | | | | | | | fixture methods can be overridden and super() is usefulAaron Patterson2011-02-151-14/+17
| * | | | | | | | | | | | | fixing variable names to reflect realityAaron Patterson2011-02-151-11/+11
| * | | | | | | | | | | | | this is in the AR namespace, so AR must existAaron Patterson2011-02-151-1/+1
| * | | | | | | | | | | | | Optimization for postgres adapter for add_column method. Set default and not ...Timothy N. Tsvetkov2011-02-151-6/+10
| * | | | | | | | | | | | | fixing variable names, removing FixtureFile instances from test ivarsAaron Patterson2011-02-151-15/+14
| * | | | | | | | | | | | | removing unused variableAaron Patterson2011-02-151-3/+1
| * | | | | | | | | | | | | fixed broken link to postgresql docsSergii Boiko2011-02-151-1/+1
* | | | | | | | | | | | | | Don't shadow outer local variable.Emilio Tagua2011-02-151-2/+2
* | | | | | | | | | | | | | Merge remote branch 'rails/master' into identity_mapEmilio Tagua2011-02-1564-2162/+3057
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | remove accidental raise!Aaron Patterson2011-02-141-1/+0
| * | | | | | | | | | | | | removing irrelevant testAaron Patterson2011-02-141-0/+1
| * | | | | | | | | | | | | Merge branch 'fixtures'Aaron Patterson2011-02-141-28/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | remove unused methodsAaron Patterson2011-02-141-35/+0
| | * | | | | | | | | | | | | extract database activity out of Fixtures instancesAaron Patterson2011-02-141-7/+23
| | * | | | | | | | | | | | | extract rows that should be inserted to a methodAaron Patterson2011-02-141-12/+12
| | * | | | | | | | | | | | | fixtures will return a list of tables that may be effected, delete existing f...Aaron Patterson2011-02-141-6/+25
| * | | | | | | | | | | | | | Merge remote branch 'jonleighton/association_fixes'Aaron Patterson2011-02-1411-90/+93
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Add a transaction wrapper in add_to_target. This means that #build will now a...Jon Leighton2011-02-141-27/+27
| | * | | | | | | | | | | | | Inline ensure_owner_is_persisted! as it is only called from one placeJon Leighton2011-02-141-8/+4
| | * | | | | | | | | | | | | @target should always be an arrayJon Leighton2011-02-141-1/+2
| | * | | | | | | | | | | | | Rename add_record_to_target_with_callbacks to add_to_targetJon Leighton2011-02-142-5/+5
| | * | | | | | | | | | | | | Don't pass the block through build_recordJon Leighton2011-02-141-10/+8
| | * | | | | | | | | | | | | Move create and create! next to buildJon Leighton2011-02-141-21/+21
| | * | | | | | | | | | | | | Get rid of create_record as it is not only used in one placeJon Leighton2011-02-141-8/+7
| | * | | | | | | | | | | | | Get rid of AssociationCollection#save_recordJon Leighton2011-02-145-26/+26
| | * | | | | | | | | | | | | Add interpolation of association conditions back in, in the form of proc { .....Jon Leighton2011-02-147-20/+29
| * | | | | | | | | | | | | | HabtmFixtures class is no longer neededAaron Patterson2011-02-141-31/+22
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Remove Relation#& alias for Relation#mergeErnie Miller2011-02-123-4/+2
| * | | | | | | | | | | | | switch over to Mysql2::Client#ping for the mysql2 connection checkBrian Lopez2011-02-121-4/+1
| * | | | | | | | | | | | | Fix table name collision due to incorrect alias count on certain joins.Ernie Miller2011-02-121-4/+4
| * | | | | | | | | | | | | key habtm fixtures off table nameAaron Patterson2011-02-111-5/+5
| * | | | | | | | | | | | | Fixture class no longer needs a reference to the database connectionAaron Patterson2011-02-111-16/+4