Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Aug 16, 2011
  1. @tenderlove

    bumping to 3.1.0.rc6

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

    Bump arel dependency

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

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

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

    Support updates with joins. Fixes #522.

    jonleighton authored
    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 authored
    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 authored
    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 authored
    Conflicts:
    
    	activerecord/activerecord.gemspec
  3. @jonleighton
  4. @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 Aug 5, 2011
  1. @spastorino
  2. @spastorino

    Fix test for Rubinius

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

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

    fxn authored
    …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 authored fxn committed
    … on both sides on an association.
  3. @fxn

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

    ejy authored fxn committed
    …er convention
  4. @campbell @fxn
Commits on Aug 3, 2011
  1. @jonleighton

    Quote these dates to prevent intermittent test failure. Suppose local…

    jonleighton authored
    … time is 00:50 GMT+1. Without the quoting, the YAML parser would parse this as 00:50 UTC, into the local time of 01:50 GMT+1. Then, it would get written into the database in local time as 01:50. When it came back out the UTC date from the database and the UTC date of two weeks ago would be compared. The former would be 23:50, and the latter would be 00:50, so the two dates would differ, causing the assertion to fail. Quoting it prevents the YAML parser from getting involved.
    
    Conflicts:
    
    	activerecord/test/fixtures/pirates.yml
  2. @tenderlove
  3. @tenderlove
  4. @cmeiklejohn @tenderlove

    Ensure that .up and .down work as well.

    cmeiklejohn authored tenderlove committed
  5. @cmeiklejohn @tenderlove
Commits on Jul 31, 2011
  1. @arunagw

    skiping magic comment test. checking encoding_aware?

    arunagw authored
    Loading AS encoding.
Commits on Jul 30, 2011
  1. @jonleighton

    Revert "Replace inline lambdas with named methods" and "Don't wrap op…

    jonleighton authored
    …erations on collection associations in transactions when they are not needed, so the connection adapter does not send empty BEGIN COMMIT transactions blocks to the database."
    
    This reverts commits df63c99 and b17fd25.
    
    The change had unintended side effects, please see #2337.
    
    Conflicts:
    
    	activerecord/test/cases/associations/has_many_associations_test.rb
Something went wrong with that request. Please try again.