aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* 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
* Should use "=" instead "replace" after this commit: 1644663ba7f678d178deab2bf...Emilio Tagua2011-02-181-1/+1
* No need to test agaisnt target.Emilio Tagua2011-02-181-1/+1
* Reindent and remove wrong line left in merge by mistake.Emilio Tagua2011-02-181-4/+3
* Use to_a instead :load in test, since :load changed.Emilio Tagua2011-02-181-1/+1
* No need to test against target anymore.Emilio Tagua2011-02-181-8/+8
* Merge remote branch 'rails/master' into identity_mapEmilio Tagua2011-02-1838-771/+833
|\
| * Split AssociationProxy into an Association class (and subclasses) which manag...Jon Leighton2011-02-1826-502/+392
| * 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-187-12/+124
| * Ensure that association_ids uses the correct attribute where the association ...Jon Leighton2011-02-184-2/+20
| * explicitly allowing lolqueriesAaron Patterson2011-02-162-13/+11
| * use the arel table rather than generating stringsAaron Patterson2011-02-161-1/+1
| * no need for Array.wrapAaron Patterson2011-02-161-1/+1
| * fixing whitespace problemsAaron Patterson2011-02-161-3/+3
| * removed an unnecessary second query when passing an ActiveRecord::Relation to...Steven Fenigstein2011-02-162-2/+32
| * fixture methods can be overridden and super() is usefulAaron Patterson2011-02-152-14/+32
| * 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-152-21/+14
| * removing unused variableAaron Patterson2011-02-151-3/+1
| * fixed broken link to postgresql docsSergii Boiko2011-02-151-1/+1
* | Fix expected queries in relation tests.Emilio Tagua2011-02-151-2/+2
* | Don't shadow outer local variable.Emilio Tagua2011-02-151-2/+2
* | Run tests without IdentityMap when IM=false is given.Emilio Tagua2011-02-156-15/+23
* | Remove identity map from benchmark script.Emilio Tagua2011-02-151-7/+0
* | Merge remote branch 'rails/master' into identity_mapEmilio Tagua2011-02-15158-3075/+5503
|\|
| * bad tests are badAaron Patterson2011-02-141-18/+0
| * remove accidental raise!Aaron Patterson2011-02-141-1/+0
| * removing irrelevant testAaron Patterson2011-02-142-18/+1
| * Merge branch 'fixtures'Aaron Patterson2011-02-141-28/+28
| |\
| | * remove unused methodsAaron Patterson2011-02-142-40/+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-142-6/+30
| * | Merge remote branch 'jonleighton/association_fixes'Aaron Patterson2011-02-1423-117/+171
| |\ \ | | |/ | |/|
| | * 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
| | * Fix test/cases/connection_pool_test.rb for sqlite3 in-memory dbJon Leighton2011-02-141-0/+10
| | * Add interpolation of association conditions back in, in the form of proc { .....Jon Leighton2011-02-1418-47/+97
| * | HabtmFixtures class is no longer neededAaron Patterson2011-02-141-31/+22
| |/
| * Add missing requireSantiago Pastorino2011-02-131-0/+1