aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Expand)AuthorAgeFilesLines
* 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-1560-2156/+3041
|\|
| * 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
| * convert fixtures to a list of hashes to insertAaron Patterson2011-02-111-2/+6
| * fixture should quack like a hashAaron Patterson2011-02-111-1/+9
| * Fixtures class constantizes this value, so no need to do it twiceAaron Patterson2011-02-111-3/+3
| * database quoting should take care of this, no need to gsubAaron Patterson2011-02-111-1/+1
| * calculate model class on constructionAaron Patterson2011-02-111-16/+11
| * clear cache for all connections when resettingAaron Patterson2011-02-111-4/+3
| * avoid side effects from method calls, localize ivar assignmentAaron Patterson2011-02-111-3/+4
| * create fixtures always returns a list, so build a hash from the listAaron Patterson2011-02-111-10/+2