Skip to content
Commits on Aug 28, 2011
  1. @spastorino

    bumping to 3.1.0.rc7

    spastorino committed
  2. @tenderlove
Commits on Aug 22, 2011
  1. @workmad3 @tenderlove
  2. @workmad3 @tenderlove

    Using .try to test for the existence of a method option in a nil-resi…

    workmad3 committed with tenderlove
    …stent manner. Inlined the determination of the options hash for reversing using a ternary operator. Shortens the method in a way that keeps the code neat
  3. @workmad3 @tenderlove
  4. @workmad3 @tenderlove
  5. @spastorino

    Merge pull request #2524 from JonathonMA/fix_ecd37084b28a05f05251

    spastorino committed
    Use mysql_creation_options inside rescue block
Commits on Aug 20, 2011
  1. @tenderlove @ernie

    Merge pull request #2602 from ernie/fix_predicate_builder_primary_key…

    tenderlove committed with ernie
    …_assumption
    
    Fix assumption of primary key name in PredicateBuilder subquery.
Commits on Aug 16, 2011
  1. @tenderlove

    bumping to 3.1.0.rc6

    tenderlove committed
  2. @tenderlove
Commits on Aug 15, 2011
  1. @jonleighton

    Bump arel dependency

    jonleighton committed
  2. @jonleighton
  3. @jonleighton
  4. @jonleighton
  5. @jonleighton
  6. @jonleighton
  7. @jonleighton

    Support for multi-table updates with limits, offsets and orders

    jonleighton committed
    Conflicts:
    
    	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
  8. @jonleighton

    Support updates with joins. Fixes #522.

    jonleighton committed
    Conflicts:
    
    	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
    	activerecord/test/cases/relations_test.rb
  9. @jonleighton
  10. @jonleighton
Commits on Aug 13, 2011
  1. @myronmarston

    Allow ActiveRecord observers to be disabled.

    myronmarston committed
    We have to use Observer#update rather than Observer#send since the enabled state is checked in #update before forwarding the method call on.
  2. @jonleighton
  3. @jonleighton
  4. @jonleighton

    Work around for lolruby bug. (Read on for explanation.)

    jonleighton committed
    We were experiencing CI test failures, for example:
    
    * 3-1-stable: http://travis-ci.org/#!/rails/rails/builds/79473/L407
    * master: http://travis-ci.org/#!/rails/rails/builds/79507/L80
    
    These failures only happened on 1.8.7-p352, and we were only able to
    reproduce on the Travis CI VM worker. We even tried creating a new 32
    bit Ubuntu VM and running the tests on that, and it all worked fine.
    
    After some epic trial and error, we discovered that replacing the
    following:
    
      fuu = Marshal.load(Marshal.dump(fuu))
    
    with:
    
      marshalled = Marshal.dump(fuu)
      fuu = Marshal.load(marshalled)
    
    seemed to prevent the failure.
    
    We have NO IDEA why this is. If anyone has some great insight to
    contribute then that is welcome. Otherwise, hopefully this will just
    help us get the CI green again.
    
    Many thanks to @joshk for help with sorting this out.
Commits on Aug 10, 2011
  1. @tenderlove
Commits on Aug 9, 2011
  1. @jonleighton
Commits on Aug 8, 2011
  1. @jonleighton
  2. @jonleighton

    Bump arel version

    jonleighton committed
    Conflicts:
    
    	activerecord/activerecord.gemspec
  3. @jonleighton
  4. @jonleighton

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

    jonleighton committed
    …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 Aug 5, 2011
  1. @spastorino
  2. @spastorino

    Fix test for Rubinius

    spastorino committed
Commits on Aug 4, 2011
  1. @fxn

    Revert "Explicitly included hashes in sentence regarding SQL-injectio…

    fxn committed
    …n-safe forms"
    
    Reason: The hash form is secure, and preferred over the array form if possible.
    
    This reverts commit 6dc7495.
  2. @vijaydev @fxn

    make the warning clear about the effect of using validates_associated…

    vijaydev committed with fxn
    … on both sides on an association.
  3. @fxn

    Removed trailing slash of 'Download and installation' Github URL as p…

    ejy committed with fxn
    …er convention
Something went wrong with that request. Please try again.