aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'mainstream/master'Pratik Naik2010-01-1765-1086/+1254
|\
| * Cache Model.arel_tablePratik Naik2010-01-171-3/+3
| * Use arel_table[] instead of unscoped[] to get arel attributePratik Naik2010-01-171-3/+3
| * Revert "Fix #microseconds conversion and #fast_string_to_time"Pratik Naik2010-01-172-50/+6
| * Rename Model.active_relation to Model.unscopedPratik Naik2010-01-177-21/+21
| * Improve the error message for class mismatch on Relation#mergePratik Naik2010-01-171-1/+3
| * Get rid of Base#merge_includesPratik Naik2010-01-162-6/+2
| * No need to set @arel_engine to nil twice. Committed by mistake in 3968825fPratik Naik2010-01-161-1/+1
| * Make sure Model#active_relation always adds STI conditions if neededPratik Naik2010-01-164-9/+6
| * Use new finder methods for association preloadingPratik Naik2010-01-161-17/+16
| * Use Relation#apply_finder_options from calculationsPratik Naik2010-01-161-16/+3
| * Add Relation#apply_finder_options for applying old finder optionsPratik Naik2010-01-162-29/+24
| * Rename active_relation_engine -> arel_engine and active_relation_table -> are...Pratik Naik2010-01-163-20/+20
| * Fix #microseconds conversion and #fast_string_to_timeChris Hapgood2010-01-162-6/+50
| * Remove protected method Class#scoped?Pratik Naik2010-01-161-9/+5
| * Make type_condition return Arel predicate and not a string conditionPratik Naik2010-01-162-6/+4
| * Remove unused default_selectPratik Naik2010-01-161-8/+0
| * Remove scope related code from construct_joinPratik Naik2010-01-162-21/+7
| * Remove stale construct_* methodsPratik Naik2010-01-161-24/+0
| * Remove construct_conditionsPratik Naik2010-01-161-11/+2
| * Simplify Model.delete_allPratik Naik2010-01-161-1/+1
| * Model.delete should just use scoped.deletePratik Naik2010-01-161-1/+1
| * Remove AR#scope() methodPratik Naik2010-01-162-34/+17
| * Fix the query matching in SubscriberTestPratik Naik2010-01-161-2/+2
| * Make scopes use relations under the hoodPratik Naik2010-01-1613-330/+361
| * Do not send the whole controller in notifications, cherry pick required pieces.José Valim2010-01-151-2/+9
| * ActiveRecord should give the connection id as payload, and not the whole conn...José Valim2010-01-151-1/+1
| * Move Dispatcher setup to Railties and add instrumentation hook.José Valim2010-01-151-0/+13
| * Different nested validations should not be ignore [#3638 status:resolved]José Valim2010-01-142-1/+10
| * Tidy up ActiveRecord and Views runtime information on process action logger.José Valim2010-01-141-3/+3
| * Add subscriber for ActionPack and move all logging inside it.José Valim2010-01-133-4/+4
| * Deprecate ActiveRecord::Base.colorize_logging.José Valim2010-01-132-9/+8
| * Create Rails::Subscriber::TestHelper and use it to make ActiveRecord subscrib...José Valim2010-01-132-0/+52
| * Move AR logging responsibilities to ActiveRecord::Railties::Subscriber.José Valim2010-01-135-46/+35
| * Remove allow_concurrency and verification_timeout from ActiveRecord::Base (de...José Valim2010-01-132-25/+0
| * Set deprecation warnings for RAILS_ENV and RAILS_DEFAULT_LOGGER.José Valim2010-01-132-31/+31
| * reduce max size of fixture IDs to fix sqlite2 tests, because sqlite2 was gett...Chad Woolley2010-01-122-3/+3
| * Use Relation#except for reversing the orderPratik Naik2010-01-121-3/+2
| * Ensure using proper engine for Arel::TablePratik Naik2010-01-121-4/+4
| * Delay building arel relation as long as possible for improved introspectionPratik Naik2010-01-127-185/+182
| * Expose connections available in the connection pool.José Valim2010-01-113-1/+5
| * Send the connection in AR notifications to avoid checking out new connections...José Valim2010-01-112-3/+5
| * Merge remote branch 'eloy/master'José Valim2010-01-0913-31/+125
| |\
| | * Renamed AssociationReflection #collection_association? to #collection?.Eloy Duran2010-01-085-14/+14
| | * Rollback the transaction when one of the autosave associations fails to save....Eloy Duran2010-01-086-5/+78
| | * Exclude unchanged records from the collection being considered for autosave. ...Lawrence Pit2010-01-082-12/+7
| | * Add failing test that triggers the stack overflowBryan Stearns2010-01-084-0/+26
| * | Ensure new validates works with uniqueness validator.José Valim2010-01-084-90/+85
| * | Allow AR::Schema's migrations_path to be overwritten by subclasses. Defaults ...Jeffrey Hardy2010-01-083-3/+11
| |/
| * Revert "Remove connection method definition, since it's called just once."Jeremy Kemper2010-01-071-1/+5