aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Collapse)AuthorAgeFilesLines
* Tidy up previous commit.José Valim2010-08-022-17/+15
|
* test and fix collection_singular_ids= with string primary keys [#5125 ↵Robert Pankowecki2010-08-021-1/+3
| | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Add an internal (private API) after_touch callback. [#5271 state:resolved]José Valim2010-08-024-15/+20
|
* Merge remote branch 'rails/master'Xavier Noria2010-07-313-26/+20
|\
| * reverting where() functionality, adding a testAaron Patterson2010-07-301-4/+4
| |
| * fewer method calls, using faster methods when possibleAaron Patterson2010-07-301-5/+5
| |
| * reducing function calls and using faster methods for testingAaron Patterson2010-07-302-16/+10
| |
| * Don't increment and then decrement the same counter when re-assigning a ↵Tarmo Tänav2010-07-291-1/+1
| | | | | | | | | | | | | | | | belongs_to association [#2786 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | returns not returned . fixing documentation for reflectionNeeraj Singh2010-07-301-28/+30
|/
* Merge remote branch 'rails/master'Xavier Noria2010-07-3010-27/+29
|\
| * edit pass to apply API guideline wrt the use of "# =>" in example codeXavier Noria2010-07-302-3/+3
| |
| * got the ternary backwards. somehow the sqlite tests passed!Aaron Patterson2010-07-291-1/+1
| |
| * PERF: avoiding splat args and reducing function callsAaron Patterson2010-07-291-8/+5
| |
| * Revert "Avoid uneeded queries in session stores if sid is not given."José Valim2010-07-291-0/+1
| | | | | | | | | | | | First step to merge Rails and Rack session stores. Rack always expects to receive the SID since it may have different behavior if the SID is nil. This reverts commit e210895ba95e498b9debbf43a3e5ae588bca81f0.
| * Shouldn't have committed this! Revert "avoid calling to_sql twice"Aaron Patterson2010-07-281-7/+4
| | | | | | | | This reverts commit 1c030a3c3c61d6d6262785bf67e1d8f44da87ea5.
| * avoid calling to_sql twiceAaron Patterson2010-07-281-4/+7
| |
| * slight performance improvement when grabbing an arel tableAaron Patterson2010-07-271-1/+1
| |
| * fixed joining of attributes when using find_or_create_by with multiple ↵Jon Buda2010-07-281-1/+1
| | | | | | | | | | | | attributes through an association Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * Prep for RCDavid Heinemeier Hansson2010-07-261-1/+1
| |
| * Move runtime back to the Thread.currentJosé Valim2010-07-263-13/+17
| |
* | moving time zone related documentation to timestamp.rb from base.rbNeeraj Singh2010-07-292-13/+12
| |
* | adding documentation regarding time_zone_aware_attributes and ↵Neeraj Singh2010-07-291-0/+13
| | | | | | | | skip_time_zone_conversion_for_attributes
* | removed ambiguity from autosave descriptionSimon Tokumine2010-07-281-1/+1
| |
* | adding punctuationsNeeraj Singh2010-07-281-4/+4
| |
* | more documentation for update_attributeNeeraj Singh2010-07-281-5/+6
| |
* | Revert "Frameworks are loaded in application.rb rather than config.rb ↵Xavier Noria2010-07-271-1/+1
| | | | | | | | | | | | | | | | | | | | according to Rails 3 conventions." This reverts commit 1793b21479d29ec29bd47c37ee68cb6ebdb71617. This commit had no risk, but docrails has a hard rule about touching code. The contribution is appreciated, I hope you do not mind this technical revert. I'll apply that to master with proper credit.
* | Frameworks are loaded in application.rb rather than config.rb according to ↵Brian Smith2010-07-271-1/+1
| | | | | | | | Rails 3 conventions.
* | adding comments to update_attribute methodNeeraj Singh2010-07-271-0/+4
|/
* No need to check for :uniqNeeraj Singh2010-07-261-6/+3
| | | | | | [#5170 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Removing unnecessary code [#5192 state:resolved]Thiago Pradi2010-07-261-4/+0
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Don't interpolate a blank string, avoid warningsSantiago Pastorino2010-07-261-0/+2
|
* Merge remote branch 'docrails/master'Xavier Noria2010-07-262-15/+18
|\
| * Fixes syntax error in "with_scope" exampleArkadiusz Holko2010-07-251-1/+1
| |
| * bringing consistency in commentsNeeraj Singh2010-07-241-14/+17
| |
* | Cache instrumenter again as per Aaron's patch.José Valim2010-07-251-1/+2
| |
* | Cache connection access.José Valim2010-07-252-6/+4
| |
* | Move runtime back to connection.José Valim2010-07-253-17/+15
| |
* | Revert the previous three commits.José Valim2010-07-253-20/+19
| | | | | | | | | | | | * AS::Notifications#instrument should not measure anything, it is not its responsibility; * Adding another argument to AS::Notifications#instrument API needs to be properly discussed;
* | look up connection onceAaron Patterson2010-07-251-2/+3
| |
* | cache the instrumentor for a speed gainAaron Patterson2010-07-251-2/+2
| |
* | use a hash to collect optional statistics about the instrumentationAaron Patterson2010-07-253-19/+19
| |
* | runtime should be properly initialized.José Valim2010-07-251-2/+1
| |
* | Move runtime to log subscriber.José Valim2010-07-253-15/+18
| |
* | Get rid of instrumenter.elapsed.José Valim2010-07-242-8/+7
| |
* | testing sqlbypass destroy. caching connection during destroyAaron Patterson2010-07-231-6/+7
| |
* | brrrrr! freeze is not neededAaron Patterson2010-07-231-1/+1
| |
* | fixing space errorAaron Patterson2010-07-221-1/+1
| |
* | refactoring more methods to a class methods moduleAaron Patterson2010-07-221-20/+12
| |
* | refactoring class methods to a moduleAaron Patterson2010-07-221-24/+18
| |
* | Session data will exceed 255 bytes. Use TEXT.Jeremy Kemper2010-07-221-1/+1
| |