aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'mainstream/master'Pratik Naik2009-03-163-5/+3
|\
| * Prepare for final 2.3 releaseDavid Heinemeier Hansson2009-03-153-5/+3
| |
* | Merge commit 'mainstream/master'Pratik Naik2009-03-145-32/+72
|\|
| * SQLite adapters now support DDL transactions [#2080 state:resolved]Jason King2009-03-143-28/+68
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Fix spelling of an internal method [#1734 state:resolved]Chris Kampmeier2009-03-122-4/+4
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | in batches.rb, rewrap rdoc, and document options as symbolsXavier Noria2009-03-121-15/+23
| |
* | Fixed some spelling errors in documentation about ↵Eloy Duran2009-03-121-5/+9
| | | | | | | | | | | | AssociationCollection::destroy and AssociationCollection::destroy_all. This time without the whitespace fixes and move of the destroy_all method.
* | Revert "Fixed some spelling errors in documentation about ↵Eloy Duran2009-03-121-26/+22
| | | | | | | | | | | | AssociationCollection::destroy and AssociationCollection::destroy_all." This reverts commit b304b0be013a05b19708659a350b89fc071e9a7d.
* | Fixed some spelling errors in documentation about ↵Eloy Duran2009-03-121-22/+26
| | | | | | | | | | | | AssociationCollection::destroy and AssociationCollection::destroy_all. Also fixed some whitespace.
* | Merge commit 'mainstream/master'Pratik Naik2009-03-1222-73/+447
|\| | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/text_helper.rb activesupport/lib/active_support/inflector.rb
| * Ensure AutosaveAssociation runs remove callbacks [#2146 state:resolved]Luca Guidi2009-03-127-21/+185
| | | | | | | | | | Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com> Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Returning nil from named scope lambda is equivalent to an empty hash [#1773 ↵Elijah Miller2009-03-123-1/+10
| | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Ensure NoMethodError isn't raised when some of the nested eager loaded ↵Murray Steele2009-03-122-4/+38
| | | | | | | | | | | | associations are empty [#1696 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Fixed autosave checks on objects with hm:t in :include [#2213 state:resolved]Will Bryant2009-03-124-1/+49
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Ensure ActiveRecord::Base.find_in_batches fires doesnt fire an extra query ↵Pratik Naik2009-03-113-2/+17
| | | | | | | | unless needed
| * Add tests for AssociationCollection#find_each and ↵Pratik Naik2009-03-112-1/+40
| | | | | | | | AssociationCollection#find_in_batches
| * Add NamedScope#find_each tests [#2201 state:resolved]Pratik Naik2009-03-111-1/+15
| |
| * Rename ActiveRecord::Base.each to ActiveRecord::Base.find_eachPratik Naik2009-03-113-7/+6
| |
| * Don't duplicate :order from scope and options, it makes mysql do extra workJeremy Kemper2009-03-102-3/+7
| |
| * Ensure nested with_scope merges conditions inside out [#2193 state:resolved]Manfred Stienstra2009-03-104-26/+57
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Ensure ActiveRecord#to_xml respects :skip_types for included associations ↵Bruce Krysiak2009-03-102-7/+24
| | | | | | | | | | | | [#1632 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | Merge commit 'mainstream/master'Pratik Naik2009-03-1054-724/+1160
|\| | | | | | | | | | | | | Conflicts: railties/guides/files/stylesheets/main.css railties/guides/rails_guides/generator.rb railties/guides/source/index.erb.textile
| * Ensure Model#destroy respects optimistic locking [#1966 state:resolved]Curtis Hawthorne2009-03-092-0/+51
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Ensure has_many :through works with changed primary keys [#736 state:resolved]Jim Remsik and Tim Pope2009-03-097-4/+26
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Allow find(:last) :order be a symbol [#2024 state:resolved]Rob Anderton2009-03-092-1/+6
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Fix find_by_last when order is given [#2127 state:committed]Jan De Poorter2009-03-094-3/+8
| | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| * Ruby 1.9 compat: rename deprecated assert_raises to assert_raise.Jeremy Kemper2009-03-0818-104/+104
| | | | | | | | [#1617 state:resolved]
| * Add ActiveRecord::Base#invalid? as the opposite of #valid? [#2159 ↵Jeffrey Hardy2009-03-082-1/+17
| | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Ensure SQLite adapters stores the config [#1947 state:resolved] [John ↵John Aughey2009-03-082-3/+8
| | | | | | | | | | | | Aughey, Pratik Naik] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Fix calculation tests to work on sqlitePratik Naik2009-03-071-5/+7
| |
| * Ensure calculations respect scoped :select [#1334 state:resolved]stopdropandrew2009-03-072-5/+24
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Ensure validates_uniqueness_of considers limit on the field. [#1042 ↵Arthur Klepchukov2009-03-074-4/+20
| | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Fix RDoc grammar and ensure hm:t tests can run in isolation. [#1644 ↵Adam Milligan2009-03-073-3/+5
| | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * DRY with_kcode in Active Record testsPratik Naik2009-03-073-28/+13
| |
| * Fixed broken migrations tests: added assert_equal. [#1704 state:resolved]Marcello Nuccio2009-03-071-7/+7
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Allow :having conditions to be sanitized like regular :condition. [#2158 ↵Will Bryant2009-03-064-5/+22
| | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Ensure belongs_to association with a counter cache in name spaced model ↵Adam Cooper2009-03-065-4/+31
| | | | | | | | | | | | works [#1678 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Ensure replacing has_one associations respects the supplied :dependent ↵Dimitri Krassovski2009-03-064-4/+33
| | | | | | | | | | | | option. [#1305 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Ensure supplie :from has precedence over scoped :from [#1370 state:resolved]Pratik Naik2009-03-062-1/+9
| |
| * Ensure self referential HABTM associations raise an exception if ↵Tom Lea2009-03-062-0/+18
| | | | | | | | | | | | association_foreign_key is missing. [#1252 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Methods invoked within named scope Procs should respect the scope stack. ↵jvoorhis2009-03-063-1/+12
| | | | | | | | | | | | [#1267 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Release RC2 todayDavid Heinemeier Hansson2009-03-051-1/+1
| |
| * Fixed reset_session for ActiveRecord session store [#2108 state:resolved]Joshua Peek2009-03-031-3/+7
| |
| * Revert "DDL transactions and savepoints for sqlite"Michael Koziarski2009-03-021-20/+1
| | | | | | | | | | | | | | | | | | This reverts commit 38136f86dc5504bde94dc7399d4a854023d7481f. Caused several test failures on the ci box: http://ci.rubyonrails.org/builds/rails/38136f [#2080 state:open]
| * DDL transactions and savepoints for sqliteJason King2009-03-021-1/+20
| | | | | | | | | | | | | | | | | | | | | | Sqlite has had DDL transactions since 2.0.0[1] and savepoints since 3.6.8[2]. This patch updates the connection_adapters. [1] http://tinyurl.com/sqlite-v2-0-0 [2] http://tinyurl.com/sqlite-v3-6-8 Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2080 state:committed]
| * Merge docrails and update the release notesPratik Naik2009-02-281-0/+19
| |
| * Fix that scoped find with :group and :having [#2006 state:resolved]Mike Gunderloy2009-02-282-1/+8
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * So it didnt happen yesterday, but very soon! Just need the final details ↵David Heinemeier Hansson2009-02-281-1/+1
| | | | | | | | ironed out
| * Prep for RC2 later todayDavid Heinemeier Hansson2009-02-273-3/+3
| |
| * Update rdoc: all is not a named_scope [#1959 state:committed]Zack Hobson2009-02-271-2/+3
| | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>