Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'mainstream/master' | Pratik Naik | 2009-03-14 | 5 | -32/+72 |
|\ | |||||
| * | SQLite adapters now support DDL transactions [#2080 state:resolved] | Jason King | 2009-03-14 | 3 | -28/+68 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Fix spelling of an internal method [#1734 state:resolved] | Chris Kampmeier | 2009-03-12 | 2 | -4/+4 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | | in batches.rb, rewrap rdoc, and document options as symbols | Xavier Noria | 2009-03-12 | 1 | -15/+23 |
| | | |||||
* | | Fixed some spelling errors in documentation about ↵ | Eloy Duran | 2009-03-12 | 1 | -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 Duran | 2009-03-12 | 1 | -26/+22 |
| | | | | | | | | | | | | AssociationCollection::destroy and AssociationCollection::destroy_all." This reverts commit b304b0be013a05b19708659a350b89fc071e9a7d. | ||||
* | | Fixed some spelling errors in documentation about ↵ | Eloy Duran | 2009-03-12 | 1 | -22/+26 |
| | | | | | | | | | | | | AssociationCollection::destroy and AssociationCollection::destroy_all. Also fixed some whitespace. | ||||
* | | Merge commit 'mainstream/master' | Pratik Naik | 2009-03-12 | 22 | -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 Guidi | 2009-03-12 | 7 | -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 Miller | 2009-03-12 | 3 | -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 Steele | 2009-03-12 | 2 | -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 Bryant | 2009-03-12 | 4 | -1/+49 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Ensure ActiveRecord::Base.find_in_batches fires doesnt fire an extra query ↵ | Pratik Naik | 2009-03-11 | 3 | -2/+17 |
| | | | | | | | | unless needed | ||||
| * | Add tests for AssociationCollection#find_each and ↵ | Pratik Naik | 2009-03-11 | 2 | -1/+40 |
| | | | | | | | | AssociationCollection#find_in_batches | ||||
| * | Add NamedScope#find_each tests [#2201 state:resolved] | Pratik Naik | 2009-03-11 | 1 | -1/+15 |
| | | |||||
| * | Rename ActiveRecord::Base.each to ActiveRecord::Base.find_each | Pratik Naik | 2009-03-11 | 3 | -7/+6 |
| | | |||||
| * | Don't duplicate :order from scope and options, it makes mysql do extra work | Jeremy Kemper | 2009-03-10 | 2 | -3/+7 |
| | | |||||
| * | Ensure nested with_scope merges conditions inside out [#2193 state:resolved] | Manfred Stienstra | 2009-03-10 | 4 | -26/+57 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Ensure ActiveRecord#to_xml respects :skip_types for included associations ↵ | Bruce Krysiak | 2009-03-10 | 2 | -7/+24 |
| | | | | | | | | | | | | [#1632 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | | Merge commit 'mainstream/master' | Pratik Naik | 2009-03-10 | 54 | -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 Hawthorne | 2009-03-09 | 2 | -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 Pope | 2009-03-09 | 7 | -4/+26 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Allow find(:last) :order be a symbol [#2024 state:resolved] | Rob Anderton | 2009-03-09 | 2 | -1/+6 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Fix find_by_last when order is given [#2127 state:committed] | Jan De Poorter | 2009-03-09 | 4 | -3/+8 |
| | | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
| * | Ruby 1.9 compat: rename deprecated assert_raises to assert_raise. | Jeremy Kemper | 2009-03-08 | 18 | -104/+104 |
| | | | | | | | | [#1617 state:resolved] | ||||
| * | Add ActiveRecord::Base#invalid? as the opposite of #valid? [#2159 ↵ | Jeffrey Hardy | 2009-03-08 | 2 | -1/+17 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Ensure SQLite adapters stores the config [#1947 state:resolved] [John ↵ | John Aughey | 2009-03-08 | 2 | -3/+8 |
| | | | | | | | | | | | | Aughey, Pratik Naik] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Fix calculation tests to work on sqlite | Pratik Naik | 2009-03-07 | 1 | -5/+7 |
| | | |||||
| * | Ensure calculations respect scoped :select [#1334 state:resolved] | stopdropandrew | 2009-03-07 | 2 | -5/+24 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Ensure validates_uniqueness_of considers limit on the field. [#1042 ↵ | Arthur Klepchukov | 2009-03-07 | 4 | -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 Milligan | 2009-03-07 | 3 | -3/+5 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | DRY with_kcode in Active Record tests | Pratik Naik | 2009-03-07 | 3 | -28/+13 |
| | | |||||
| * | Fixed broken migrations tests: added assert_equal. [#1704 state:resolved] | Marcello Nuccio | 2009-03-07 | 1 | -7/+7 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Allow :having conditions to be sanitized like regular :condition. [#2158 ↵ | Will Bryant | 2009-03-06 | 4 | -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 Cooper | 2009-03-06 | 5 | -4/+31 |
| | | | | | | | | | | | | works [#1678 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Ensure replacing has_one associations respects the supplied :dependent ↵ | Dimitri Krassovski | 2009-03-06 | 4 | -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 Naik | 2009-03-06 | 2 | -1/+9 |
| | | |||||
| * | Ensure self referential HABTM associations raise an exception if ↵ | Tom Lea | 2009-03-06 | 2 | -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. ↵ | jvoorhis | 2009-03-06 | 3 | -1/+12 |
| | | | | | | | | | | | | [#1267 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Release RC2 today | David Heinemeier Hansson | 2009-03-05 | 1 | -1/+1 |
| | | |||||
| * | Fixed reset_session for ActiveRecord session store [#2108 state:resolved] | Joshua Peek | 2009-03-03 | 1 | -3/+7 |
| | | |||||
| * | Revert "DDL transactions and savepoints for sqlite" | Michael Koziarski | 2009-03-02 | 1 | -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 sqlite | Jason King | 2009-03-02 | 1 | -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 notes | Pratik Naik | 2009-02-28 | 1 | -0/+19 |
| | | |||||
| * | Fix that scoped find with :group and :having [#2006 state:resolved] | Mike Gunderloy | 2009-02-28 | 2 | -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 Hansson | 2009-02-28 | 1 | -1/+1 |
| | | | | | | | | ironed out | ||||
| * | Prep for RC2 later today | David Heinemeier Hansson | 2009-02-27 | 3 | -3/+3 |
| | | |||||
| * | Update rdoc: all is not a named_scope [#1959 state:committed] | Zack Hobson | 2009-02-27 | 1 | -2/+3 |
| | | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
| * | Force all internal calls to Array#to_sentence to use English [#2010 ↵ | David Heinemeier Hansson | 2009-02-27 | 1 | -1/+1 |
| | | | | | | | | state:resolved] | ||||
| * | Don't validate records of an :autosave association if they're marked for ↵ | Eloy Duran | 2009-02-27 | 2 | -7/+34 |
| | | | | | | | | | | | | destruction. [#2064 status:resolved] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> |