aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@github.com:lifo/docrailsTomK322008-06-1157-395/+802
|\
| * Mass typo and misspelling fix.Evan Farrar2008-06-046-8/+8
| |
| * Merge commit 'mainstream/master'Pratik Naik2008-06-0222-33/+156
| |\
| | * Added SQL escaping for :limit and :offset in MySQL [Jonathan Wiess]David Heinemeier Hansson2008-06-013-2/+8
| | |
| | * fix changelog conflictrick2008-05-317-7/+42
| | |\
| | | * revert mysql test credential changeJeremy Kemper2008-05-311-2/+2
| | | |
| | | * Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-05-312-1/+7
| | | |\
| | | | * Substitute value into validates_format_of messageJohn D. Hume2008-05-312-1/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| | | * | Making ready for release of 2.1David Heinemeier Hansson2008-05-314-7/+9
| | | |/
| | | * Added SQL escaping for :limit and :offset [#288 state:closed] (Aaron Bedra, ↵David Heinemeier Hansson2008-05-312-2/+27
| | | | | | | | | | | | | | | | Steven Bristol, Jonathan Wiess)
| | * | Add ActiveRecord::Base.sti_name that checks ↵rick2008-05-314-6/+32
| | |/ | | | | | | | | | ActiveRecord::Base#store_full_sti_class? and returns either the full or demodulized name. [rick] [#114 state:resolved]
| | * belongs_to polymorphic association assignments update the foreign_id and ↵Tim Harper2008-05-312-5/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | foreign_type fields regardless of whether the record being assigned is new or not. fixes the following scenarios: * I have validates_inclusion_of on the type field for a polymorphic belongs_to association. I assign a new record to the model's polymorphic relationship of the proper type. validation fails because the type field has not been updated. * I replace the value for a ppolymorphic association to a new record of another class. The type field still says its the previous class, and the id field points to the previous record as well. [#191 state:closed]
| | * Fix default nil tests for MySQL 5.0.51 [#192 state:resolved]Ryan Bates2008-05-311-1/+1
| | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| | * Ensure query assertion counts are the same when partial updates are enabledJeremy Kemper2008-05-302-0/+3
| | |
| | * Enable partial updates by defaultJeremy Kemper2008-05-301-1/+1
| | |
| | * Ensure :select passed in options overrides the one from the scope. [#239 ↵Andrew White2008-05-292-1/+17
| | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| | * Ensure AssociationCollection#count works with empty condition. [#271 ↵Pratik Naik2008-05-292-1/+5
| | | | | | | | | | | | state:resolved] [Jan De Poorter]
| | * Ensure correct db time is reported in production logs.Pratik Naik2008-05-281-9/+5
| | |
| | * Ensure named_scope#empty? uses count query. [#262 state:resolved]Ryan Bates2008-05-282-1/+13
| | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * | Merge commit 'mainstream/master'Pratik Naik2008-05-272-5/+5
| |\|
| | * Fix tests for postgres 8.3.xTarmo Tänav2008-05-262-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Made test_with_limiting_with_custom_select not dependent on database default order. Fixed tests with non-US monetary locale. The monetary type is fixed precision so it should not expect the database to return a float. Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| | * Merge docrails.Pratik Naik2008-05-2523-256/+279
| | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * | revised some conventions in validations docsXavier Noria2008-05-251-23/+23
| | |
| * | revised markup in dirty.rb docsXavier Noria2008-05-251-6/+6
| | |
| * | Merge commit 'mainstream/master'Pratik Naik2008-05-2510-17/+53
| |\| | | | | | | | | | | | | | | | Conflicts: railties/configs/initializers/new_rails_defaults.rb
| | * Fix faulty tests introduced in 8d0b4fa39Michael Koziarski2008-05-243-4/+5
| | |
| | * Create through associations can now work with blocks.Ryan Bates2008-05-242-8/+17
| | | | | | | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#248 state:resolved]
| | * add failing test case for block-setting of attributes via associationTrevor Turk2008-05-241-0/+9
| | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| | * Added :select option to has_one and belongs_to, remove unused :order option ↵josevalim2008-05-247-13/+30
| | | | | | | | | | | | | | | | | | | | | on belongs_to. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#241 state:resolved]
| * | Fixup weird RDoc markup that does not render correctlyCody Fauser2008-05-232-6/+4
| | |
| * | overall cleanup of "#=>" and other minor detailsXavier Noria2008-05-232-17/+19
| | |
| * | Merge commit 'mainstream/master'Pratik Naik2008-05-225-43/+87
| |\|
| | * Fix failing tests on mysql 4.1 & ruby 1.8.4. [#237 state:resolved]Frederick Cheung2008-05-221-2/+2
| | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| | * Fix mysql 4.1 incompatibility in the active record schema tests.Frederick Cheung2008-05-221-32/+41
| | | | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#233 state:resolved ]
| | * ActiveRecord::Base#reload should clear dirty attributes. [#231 state:resolved]Ryan Bates2008-05-212-0/+16
| | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| | * Verbose ActiveRecord::AssociationTypeMismatch exception message. [#189 ↵Pratik Naik2008-05-211-1/+2
| | | | | | | | | | | | state:resolved]
| | * Ensure nil to '' doesn't get recorded by dirty for nullable integer columns. ↵Pratik Naik2008-05-202-8/+26
| | | | | | | | | | | | [#150 state:resolved] [Jason Dew, Pratik]
| * | regular font for a constantXavier Noria2008-05-211-1/+1
| | |
| * | Merge branch 'master' of git@github.com:lifo/docrailsJoshua French2008-05-219-34/+34
| |\ \
| | * | gsub("ActiveRecord", "Active Record")Xavier Noria2008-05-219-34/+34
| | | |
| * | | Revised example conventions in active_record/baseJoshua French2008-05-211-16/+18
| |/ /
| * | revised font of constants in Active RecordXavier Noria2008-05-213-13/+13
| | |
| * | revised docs of first/last in AR base and association collectionXavier Noria2008-05-202-6/+6
| | |
| * | Merge commit 'mainstream/master'Pratik Naik2008-05-2010-4/+179
| |\|
| | * Add first/last methods to associations/named_scope. [#226 state:resolved]Ryan Bates2008-05-208-4/+149
| | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| | * Ensure add_column gives valid error for sqlite. [Gunnar Wolf, Pratik] [#197 ↵Pratik Naik2008-05-202-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | state:resolved] SQLite#add_column executes "VACUUM", which fails if inside a live transaction. This patch ensures a valid exception is raised if add_column is executed within a live transaction for sqlite adapter.
| * | revised conventions in time zone related docsXavier Noria2008-05-201-4/+4
| | |
| * | Merge commit 'mainstream/master'Pratik Naik2008-05-205-6/+10
| |\|
| | * Don't rely on association proxying object_id. [#225 state:resolved]Jeremy Kemper2008-05-191-2/+2
| | |
| | * - Updated tzinfo to use Rational() instead of Rational.new! due to "private ↵Nate Wiger2008-05-192-3/+3
| | | | | | | | | | | | | | | | | | method new!" in Ruby 1.9 - Added ^object_id$ as ignore pattern to fixing "redefining object_id" issue in Ruby 1.9 Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>