Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'origin/master' into savepoints | Hongli Lai (Phusion) | 2008-12-09 | 8 | -32/+74 |
|\ | |||||
| * | Make word separator in AR validation error messages configurable. | Akira Matsuda | 2008-12-08 | 1 | -1/+1 |
| | | | | | | | | | | | | [#1294 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Change field_changed? method to handle the case where a nullable integer ↵ | Ben Symonds | 2008-12-08 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | column is changed from 0 to '0' [#1530 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Merge with docrails | Pratik Naik | 2008-12-07 | 6 | -28/+67 |
| | | |||||
| * | Make NoMethodError message more descriptive when an undefined message has ↵ | Mike Ferrier | 2008-12-04 | 1 | -1/+4 |
| | | | | | | | | | | | | been sent to an association [#1515 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | | Merge commit 'origin/master' into savepoints | Hongli Lai (Phusion) | 2008-12-03 | 15 | -246/+290 |
|\| | | | | | | | | | | | Conflicts: activerecord/lib/active_record/fixtures.rb activerecord/test/cases/defaults_test.rb | ||||
| * | Add :having option to find, to use in combination with grouped finds. Also ↵ | miloops | 2008-12-01 | 3 | -7/+15 |
| | | | | | | | | | | | | | | added to has_many and has_and_belongs_to_many associations. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1028 state:committed] | ||||
| * | Removed extra 'as' in :joins clause for habtm preloading | Foliosus | 2008-12-01 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1405 state:committed] | ||||
| * | Ensure hash conditions on referenced tables are considered when eager ↵ | Paul | 2008-11-26 | 1 | -0/+1 |
| | | | | | | | | | | | | loading with limit/offset. [#1404 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Rename use_transactional_fixtures? so it doesn't collide with the ↵ | Jeremy Kemper | 2008-11-25 | 1 | -4/+4 |
| | | | | | | | | superclass_delegating_accessor's query method | ||||
| * | Add config.preload_frameworks to load all frameworks at startup. Default to ↵ | Jeremy Kemper | 2008-11-24 | 1 | -2/+0 |
| | | | | | | | | false so Rails autoloads itself as it's used. | ||||
| * | missed ActiveRecord::Migrator | Joshua Peek | 2008-11-24 | 1 | -0/+1 |
| | | |||||
| * | get activerecord tests passing with lazy loading | Joshua Peek | 2008-11-24 | 2 | -0/+6 |
| | | |||||
| * | fixtures depends on dependencies | Joshua Peek | 2008-11-24 | 1 | -0/+1 |
| | | |||||
| * | require json lib when serialization is loaded | Joshua Peek | 2008-11-24 | 1 | -0/+2 |
| | | |||||
| * | Add LAZY env flag for testing autoload/lazy load feature | Joshua Peek | 2008-11-24 | 1 | -1/+1 |
| | | |||||
| * | Autoload ActiveRecord files | Joshua Peek | 2008-11-24 | 5 | -53/+61 |
| | | |||||
| * | Docfix [#1444 state:committed] | David Heinemeier Hansson | 2008-11-23 | 1 | -2/+2 |
| | | |||||
| * | Remove SQL Server cases from tests for latest adapter work to pass rails ↵ | Ken Collins | 2008-11-19 | 1 | -4/+2 |
| | | | | | | | | | | | | expected behavior. Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | Remove reset! as a connection#checkout callback | Pratik Naik | 2008-11-19 | 1 | -1/+1 |
| | | |||||
| * | Assume that the next version is going to be 2.3 for now | David Heinemeier Hansson | 2008-11-19 | 1 | -2/+2 |
| | | |||||
| * | use :en as a default locale (in favor of :en-US) | Sven Fuchs | 2008-11-18 | 2 | -2/+2 |
| | | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
| * | Fix default_scope to work in combination with named scopes | Tom Stuart | 2008-11-17 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
| * | Ensure shared default_scoping stack is duped before assigning to thread local | Joshua Peek | 2008-11-16 | 1 | -1/+1 |
| | | |||||
| * | Added default_scope to Base [#1381 state:committed] (Paweł Kondzior) | Pratik Naik | 2008-11-16 | 1 | -1/+15 |
| | | |||||
| * | Ensure @@already_loaded_fixtures is initialized before use | Pratik Naik | 2008-11-16 | 1 | -1/+1 |
| | | |||||
| * | Revert "Added default_scope to Base [#1381 state:committed] (Paweł ↵ | David Heinemeier Hansson | 2008-11-16 | 1 | -10/+0 |
| | | | | | | | | | | | | Kondzior)" -- won't gel with threads. This reverts commit ff594b2bc94ff2a942fe6ca05672387722dee686. | ||||
| * | Added default_scope to Base [#1381 state:committed] (Paweł Kondzior) | David Heinemeier Hansson | 2008-11-16 | 1 | -0/+10 |
| | | |||||
| * | Merge branch 'master' into testing | Jeremy Kemper | 2008-11-15 | 5 | -8/+15 |
| |\ | |||||
| | * | Moved the * strings out of construct_finder_sql to a new default_select ↵ | Will Bryant | 2008-11-15 | 1 | -1/+9 |
| | | | | | | | | | | | | | | | | | | | | | method so it can be overridden by plugins cleanly Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1371 state:resolved] | ||||
| | * | fix assignment to has_one :through associations. | Matt Jones | 2008-11-15 | 1 | -4/+3 |
| | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| | * | Prepare for RC2 | David Heinemeier Hansson | 2008-11-14 | 1 | -1/+1 |
| | | | |||||
| | * | Revert "Move fixtures settings from AR::TestCase to railties test_help" -- ↵ | David Heinemeier Hansson | 2008-11-14 | 1 | -1/+9 |
| | | | | | | | | | | | | | | | | | | it broke all the tests! This reverts commit 9a88ab64bb45ddb2bdcf80fab9203111d8f8abb4. | ||||
| | * | Move fixtures settings from AR::TestCase to railties test_help | Jeremy Kemper | 2008-11-13 | 1 | -9/+1 |
| | | | |||||
| | * | Make sure any Fixnum returned by a DB sum is type cast to a Float before ↵ | Ken Collins | 2008-11-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | standard converstion to a BigDecimal [#8994 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| | * | Remove redundant uniq | Frederick Cheung | 2008-11-11 | 1 | -1/+1 |
| | | | |||||
| * | | Remove superfluous require | Jeremy Kemper | 2008-11-13 | 1 | -1/+0 |
| | | | |||||
| * | | Move fixtures settings from AR::TestCase to railties test_help | Jeremy Kemper | 2008-11-12 | 1 | -11/+1 |
| | | | |||||
| * | | Merge branch 'master' into testing | Jeremy Kemper | 2008-11-11 | 1 | -1/+1 |
| |\| | |||||
| | * | Add simple case when DB calculations returns 0 instead of 0.0 [#1346 ↵ | Joshua Peek | 2008-11-10 | 1 | -1/+1 |
| | | | | | | | | | | | | state:resolved] | ||||
| * | | lazy-initialize already loaded fixtures map | Jeremy Kemper | 2008-11-08 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into testing | Jeremy Kemper | 2008-11-08 | 1 | -3/+11 |
| |\| | |||||
| | * | Timeout the connection pool monitor on ruby 1.8 only | Jeremy Kemper | 2008-11-08 | 1 | -3/+11 |
| | | | |||||
| * | | Merge branch 'master' into testing | Jeremy Kemper | 2008-11-07 | 1 | -1/+1 |
| |\| | |||||
| | * | If average value from DB is 0, make sure to convert it to a 0.0 float before ↵ | Ken Collins | 2008-11-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | calling #to_d on it [#1346 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | | Merge branch 'master' into testing | Jeremy Kemper | 2008-11-07 | 4 | -15/+7 |
| |\| | |||||
| | * | Don't leave open dangling connections in development mode. [#1335 ↵ | Pratik Naik | 2008-11-08 | 1 | -2/+1 |
| | | | | | | | | | | | | state:resolved] | ||||
| | * | Simplify dispatcher callbacks to eliminate unnecessary stale thread purging. ↵ | Nick Sieger | 2008-11-08 | 1 | -4/+1 |
| | | | | | | | | | | | | | | | | | | [Nick Sieger, Pratik Naik] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| | * | Added :counter_sql as a valid key for habtm associations | Tekin Suleyman | 2008-11-07 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| | * | Revert commit which breaks all the tests. | Michael Koziarski | 2008-11-07 | 1 | -8/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8adb79b9b5983cda8dbdd4ef401661fbd51d8844. Conflicts: activerecord/CHANGELOG |