Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Aug 8, 2011
  1. @jonleighton

    Make it the responsibility of the connection to hold onto an ARel vis…

    jonleighton authored
    …itor for generating SQL. This improves the code architecture generally, and solves some problems with marshalling. Adapter authors please take note: you now need to define an Adapter.visitor_for method, but it degrades gracefully with a deprecation warning for now.
    
    Conflicts:
    
    	activerecord/lib/active_record/relation/finder_methods.rb
    	activerecord/test/cases/adapter_test.rb
Commits on Jul 25, 2011
  1. @fxn

    Fixed Typo

    John authored fxn committed
Commits on Jul 8, 2011
  1. @jonleighton

    Destroy association habtm record before destroying the record itself.…

    Tomas D'Stefano authored jonleighton committed
    … Fixes issue #402.
Commits on Jun 28, 2011
  1. @tenderlove
Commits on Jun 7, 2011
  1. @dmitriy-kiriyenko @jonleighton
Commits on May 24, 2011
  1. @tenderlove
Commits on May 8, 2011
  1. @joshk
Commits on Apr 29, 2011
  1. @tenderlove
Commits on Apr 26, 2011
  1. @smartinez87
  2. @joshk
Commits on Mar 28, 2011
  1. @smartinez87 @spastorino

    Added new #update_column method.

    smartinez87 authored spastorino committed
    Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
Commits on Mar 27, 2011
  1. @smartinez87 @spastorino

    Revert "Removed #update_attribute method. New #update_column method."

    smartinez87 authored spastorino committed
    This reverts commit 45c233e.
    
    Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
Commits on Mar 26, 2011
  1. @smartinez87 @spastorino

    Removed #update_attribute method. New #update_column method.

    smartinez87 authored spastorino committed
    Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
Commits on Mar 22, 2011
  1. @tenderlove
Commits on Feb 15, 2011
  1. @miloops

    Merge remote branch 'rails/master' into identity_map

    miloops authored
    Conflicts:
    	activerecord/examples/performance.rb
    	activerecord/lib/active_record/association_preload.rb
    	activerecord/lib/active_record/associations.rb
    	activerecord/lib/active_record/associations/association_proxy.rb
    	activerecord/lib/active_record/autosave_association.rb
    	activerecord/lib/active_record/base.rb
    	activerecord/lib/active_record/nested_attributes.rb
    	activerecord/test/cases/relations_test.rb
Commits on Feb 9, 2011
  1. @joshk

    removed some duplication from LH issue 5505 regarding AR touch and op…

    joshk authored Santiago Pastorino and José Ignacio Costa committed
    …timistic locking [#5505 state:resolved]
    
    Signed-off-by: Santiago Pastorino and José Ignacio Costa <santiago+jose@wyeworks.com>
  2. @franckverrot

    The optimistic lock column should be increased when calling touch

    franckverrot authored Santiago Pastorino and José Ignacio Costa committed
    Signed-off-by: Santiago Pastorino and José Ignacio Costa <santiago+jose@wyeworks.com>
Commits on Dec 29, 2010
  1. @spastorino
Commits on Dec 28, 2010
  1. @spastorino
Commits on Dec 20, 2010
  1. @miloops

    Merge remote branch 'rails/master' into identity_map

    miloops authored
    Conflicts:
    	activerecord/lib/active_record/associations/association_proxy.rb
    	activerecord/lib/active_record/autosave_association.rb
    	activerecord/lib/active_record/base.rb
    	activerecord/lib/active_record/persistence.rb
Commits on Dec 2, 2010
  1. @tenderlove
  2. @tenderlove
Commits on Nov 28, 2010
  1. @josevalim

    Partialy revert f1c13b0

    josevalim authored
Commits on Nov 19, 2010
  1. @miloops
  2. @swistak @miloops
Commits on Nov 11, 2010
  1. @franckverrot @josevalim
Commits on Nov 9, 2010
  1. @spastorino
  2. @spastorino
  3. @dchelimsky @spastorino

    use persisted? instead of new_record? wherever possible

    dchelimsky authored spastorino committed
    - persisted? is the API defined in ActiveModel
    - makes it easier for extension libraries to conform to ActiveModel APIs
      without concern for whether the extended object is specifically
      ActiveRecord
    
    [#5927 state:committed]
    
    Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
Commits on Sep 24, 2010
  1. @tnp @josevalim

    restore behavior of touch for models without :updated_xx [#5439 state…

    tnp authored josevalim committed
    …:resolved]
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
Commits on Sep 22, 2010
  1. @miloops @spastorino

    Use map instead inject.

    miloops authored spastorino committed
    Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
Commits on Aug 27, 2010
  1. @tilsammans

    The call-seq directive has no useful effect on our documentation and …

    tilsammans authored
    …is not used anywhere else.
    
    Worse still, its use breaks some rdoc, replacing method names with a curly brace.
    Having just one call-seq directive doesn't add anything since this is covered by regular rdoc.
    Having multiple might make sense, but these are already documented with examples.
    
    This partly re-reverts 60de0e5 but does not
    touch the vendorized code in html-scanner.
Commits on Aug 24, 2010
  1. @fxn

    edit pass to a recent doc patch

    fxn authored
  2. @fxn
  3. @neerajdotname @josevalim

    @user.touch should not fail if User does not have updated_at/updated_…

    neerajdotname authored josevalim committed
    …on column.
    
    [#5439 state:resolved]
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
Something went wrong with that request. Please try again.