Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'mainstream/master' | Pratik Naik | 2010-01-17 | 37 | -802/+806 |
|\ | | | | | | | | | Conflicts: actionpack/lib/action_controller/metal/flash.rb | ||||
| * | Cache Model.arel_table | Pratik Naik | 2010-01-17 | 1 | -3/+3 |
| | | |||||
| * | Use arel_table[] instead of unscoped[] to get arel attribute | Pratik Naik | 2010-01-17 | 1 | -3/+3 |
| | | |||||
| * | Revert "Fix #microseconds conversion and #fast_string_to_time" | Pratik Naik | 2010-01-17 | 1 | -7/+6 |
| | | | | | | | | This reverts commit 717a2941e15b32d07cc456bb0d81742ecfc5b4a3. Bunch of failures when running postgresql tests. | ||||
| * | Rename Model.active_relation to Model.unscoped | Pratik Naik | 2010-01-17 | 7 | -21/+21 |
| | | |||||
| * | Improve the error message for class mismatch on Relation#merge | Pratik Naik | 2010-01-17 | 1 | -1/+3 |
| | | |||||
| * | Get rid of Base#merge_includes | Pratik Naik | 2010-01-16 | 2 | -6/+2 |
| | | |||||
| * | No need to set @arel_engine to nil twice. Committed by mistake in 3968825f | Pratik Naik | 2010-01-16 | 1 | -1/+1 |
| | | |||||
| * | Make sure Model#active_relation always adds STI conditions if needed | Pratik Naik | 2010-01-16 | 4 | -9/+6 |
| | | |||||
| * | Use new finder methods for association preloading | Pratik Naik | 2010-01-16 | 1 | -17/+16 |
| | | |||||
| * | Use Relation#apply_finder_options from calculations | Pratik Naik | 2010-01-16 | 1 | -16/+3 |
| | | |||||
| * | Add Relation#apply_finder_options for applying old finder options | Pratik Naik | 2010-01-16 | 2 | -29/+24 |
| | | |||||
| * | Rename active_relation_engine -> arel_engine and active_relation_table -> ↵ | Pratik Naik | 2010-01-16 | 2 | -18/+18 |
| | | | | | | | | arel_table | ||||
| * | Fix #microseconds conversion and #fast_string_to_time | Chris Hapgood | 2010-01-16 | 1 | -6/+7 |
| | | | | | | | | | | | | | | | | * Use direct integer parsing in #fast_string_to_time to avoid convoluted conversions and errors due to truncation. * Use Float#round in #microseconds to avoid truncation errors. Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | Remove protected method Class#scoped? | Pratik Naik | 2010-01-16 | 1 | -9/+5 |
| | | |||||
| * | Make type_condition return Arel predicate and not a string condition | Pratik Naik | 2010-01-16 | 2 | -6/+4 |
| | | |||||
| * | Remove unused default_select | Pratik Naik | 2010-01-16 | 1 | -8/+0 |
| | | |||||
| * | Remove scope related code from construct_join | Pratik Naik | 2010-01-16 | 2 | -21/+7 |
| | | |||||
| * | Remove stale construct_* methods | Pratik Naik | 2010-01-16 | 1 | -24/+0 |
| | | |||||
| * | Remove construct_conditions | Pratik Naik | 2010-01-16 | 1 | -11/+2 |
| | | |||||
| * | Simplify Model.delete_all | Pratik Naik | 2010-01-16 | 1 | -1/+1 |
| | | |||||
| * | Model.delete should just use scoped.delete | Pratik Naik | 2010-01-16 | 1 | -1/+1 |
| | | |||||
| * | Remove AR#scope() method | Pratik Naik | 2010-01-16 | 2 | -34/+17 |
| | | |||||
| * | Make scopes use relations under the hood | Pratik Naik | 2010-01-16 | 11 | -269/+329 |
| | | |||||
| * | Do not send the whole controller in notifications, cherry pick required pieces. | José Valim | 2010-01-15 | 1 | -2/+9 |
| | | |||||
| * | ActiveRecord should give the connection id as payload, and not the whole ↵ | José Valim | 2010-01-15 | 1 | -1/+1 |
| | | | | | | | | connection. | ||||
| * | Move Dispatcher setup to Railties and add instrumentation hook. | José Valim | 2010-01-15 | 1 | -0/+13 |
| | | |||||
| * | Different nested validations should not be ignore [#3638 status:resolved] | José Valim | 2010-01-14 | 1 | -1/+2 |
| | | |||||
| * | Tidy up ActiveRecord and Views runtime information on process action logger. | José Valim | 2010-01-14 | 1 | -3/+3 |
| | | |||||
| * | Add subscriber for ActionPack and move all logging inside it. | José Valim | 2010-01-13 | 2 | -2/+2 |
| | | |||||
| * | Deprecate ActiveRecord::Base.colorize_logging. | José Valim | 2010-01-13 | 1 | -8/+7 |
| | | |||||
| * | Create Rails::Subscriber::TestHelper and use it to make ActiveRecord ↵ | José Valim | 2010-01-13 | 1 | -0/+1 |
| | | | | | | | | subscriber tests run in both sync and async scenarios. | ||||
| * | Move AR logging responsibilities to ActiveRecord::Railties::Subscriber. | José Valim | 2010-01-13 | 4 | -34/+34 |
| | | |||||
| * | Remove allow_concurrency and verification_timeout from ActiveRecord::Base ↵ | José Valim | 2010-01-13 | 2 | -25/+0 |
| | | | | | | | | (deprecated since 2.2). | ||||
| * | Set deprecation warnings for RAILS_ENV and RAILS_DEFAULT_LOGGER. | José Valim | 2010-01-13 | 2 | -31/+31 |
| | | |||||
| * | reduce max size of fixture IDs to fix sqlite2 tests, because sqlite2 was ↵ | Chad Woolley | 2010-01-12 | 1 | -1/+1 |
| | | | | | | | | | | | | getting negative and changing values for ID field. See http://www.sqlite.org/datatypes.html Signed-off-by: Yehuda Katz <wycats@gmail.com> | ||||
| * | Use Relation#except for reversing the order | Pratik Naik | 2010-01-12 | 1 | -3/+2 |
| | | |||||
| * | Ensure using proper engine for Arel::Table | Pratik Naik | 2010-01-12 | 1 | -4/+4 |
| | | |||||
| * | Delay building arel relation as long as possible for improved introspection | Pratik Naik | 2010-01-12 | 7 | -185/+182 |
| | | |||||
| * | Expose connections available in the connection pool. | José Valim | 2010-01-11 | 2 | -1/+3 |
| | | |||||
| * | Send the connection in AR notifications to avoid checking out new ↵ | José Valim | 2010-01-11 | 2 | -3/+5 |
| | | | | | | | | connections in threads just for logging purposes. | ||||
| * | Merge remote branch 'eloy/master' | José Valim | 2010-01-09 | 4 | -17/+23 |
| |\ | |||||
| | * | Renamed AssociationReflection #collection_association? to #collection?. | Eloy Duran | 2010-01-08 | 4 | -10/+10 |
| | | | |||||
| | * | Rollback the transaction when one of the autosave associations fails to ↵ | Eloy Duran | 2010-01-08 | 1 | -4/+10 |
| | | | | | | | | | | | | save. [#3391 state:resolved] | ||||
| | * | Exclude unchanged records from the collection being considered for autosave. ↵ | Lawrence Pit | 2010-01-08 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | [#2578 state:resolved] Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com> | ||||
| * | | Ensure new validates works with uniqueness validator. | José Valim | 2010-01-08 | 2 | -5/+7 |
| | | | |||||
| * | | Allow AR::Schema's migrations_path to be overwritten by subclasses. Defaults ↵ | Jeffrey Hardy | 2010-01-08 | 3 | -3/+11 |
| |/ | | | | | | | | | | | | | | | to 'db/migrate' [#3671 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Revert "Remove connection method definition, since it's called just once." | Jeremy Kemper | 2010-01-07 | 1 | -1/+5 |
| | | | | | | | | | | | | Restore the connection method which was added so it can be overridden. This reverts commit e428c75d2b67c6a7bd5f5e7e1719cdece84d497f. | ||||
| * | Merge remote branch 'eloy/master' | José Valim | 2010-01-07 | 4 | -62/+67 |
| |\ | |||||
| | * | Raise a RecordNotFound if an ID in nested attributes is given but doesn't ↵ | Eloy Duran | 2010-01-07 | 1 | -0/+11 |
| | | | | | | | | | | | | return a record. [#2415 state:resolved] |