Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on May 9, 2012
  1. @carlosantoniodasilva

    Stop showing deprecations for Ruby 1.8.7 with remove_column

    carlosantoniodasilva authored
    String is Enumerable in 1.8.7, which means that passing a String to
    remove_column was generating deprecation warnings during tests.
Commits on May 5, 2012
  1. @tenderlove

    Merge pull request #6128 from frodsan/delete_all_limit_32

    tenderlove authored
    Fix #4979 against 3-2-stable
Commits on May 2, 2012
  1. @frodsan
  2. @drogus
Commits on Apr 30, 2012
  1. @rafaelfranca
Commits on Apr 24, 2012
  1. @carlosantoniodasilva
  2. @kennyj @sikachu

    Fix build. It seems that the Mocha's behavior were changed.

    kennyj authored sikachu committed
Commits on Apr 23, 2012
  1. @arunagw
Commits on Apr 19, 2012
  1. @amatsuda @jeremy

    Be sure to correctly fetch PK name from MySQL even if the PK has some…

    amatsuda authored jeremy committed
    … custom option
    
    Backports #5900
    
    Conflicts:
    
    	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
    	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
  2. @benedikt
  3. @benedikt

    Revert "Revert "Fix #5667. Preloading should ignore scoping.""

    benedikt authored
    This reverts commit 1166d49.
    
    Conflicts:
    
    	activerecord/test/cases/associations/eager_test.rb
  4. @benedikt

    Adds test to check that circular preloading does not modify Model.uns…

    benedikt authored
    …coped (as described in #5667)
    
    Conflicts:
    
    	activerecord/test/cases/associations/eager_test.rb
  5. @benedikt

    Removes caching from ActiveRecord::Core::ClassMethods#relation

    benedikt authored
    The #relation method gets called in four places and the return value was instantly cloned in three of them. The only place that did not clone was ActiveRecord::Scoping::Default::ClassMethods#unscoped. This introduced a bug described in #5667 and should really clone the relation, too. This means all four places would clone the relation, so it doesn't make a lot of sense caching it in the first place.
    
    The four places with calls to relations are:
    
    activerecord/lib/active_record/scoping/default.rb:110:in `block in build_default_scope'"
    activerecord/lib/active_record/scoping/default.rb:42:in `unscoped'"
    activerecord/lib/active_record/scoping/named.rb:38:in `scoped'"
    activerecord/lib/active_record/scoping/named.rb:52:in `scope_attributes'"
    
    Conflicts:
    
    	activerecord/lib/active_record/core.rb
  6. @jeremy

    Revert "Fix #5667. Preloading should ignore scoping."

    jeremy authored
    Causes a subtle regression where record.reload includes the default
    scope. Hard to reproduce in isolation. Seems like the relation is
    getting infected by some previous usage.
    
    This reverts commit dffbb52.
Commits on Apr 18, 2012
  1. @norman

    Check for nil logger

    norman authored
Commits on Apr 9, 2012
  1. @fxn

    Merge pull request #5725 from kevmoo/remove_unused_castcode

    fxn authored
    Remove unused castcode
Commits on Apr 4, 2012
  1. @rafaelfranca
  2. @hone
  3. @kevmoo
Commits on Apr 3, 2012
  1. @tpope @tenderlove

    DATABASE_URL allows omission of database.yml

    tpope authored tenderlove committed
Commits on Mar 30, 2012
  1. @tenderlove

    Merge pull request #5662 from arturopie/3-2_fixing_IM_when_using_find…

    tenderlove authored
    …_select
    
    Fixing Identity Map when using find select in rails 3.2
  2. @spastorino
  3. @spastorino

    Bump up to 3.2.3

    spastorino authored
  4. @jonleighton

    Fix #5667. Preloading should ignore scoping.

    jonleighton authored
    Conflicts:
    
    	activerecord/test/cases/associations/eager_test.rb
  5. @arturopie

    refactor instantiate method in base, so we remove nesting if's which …

    arturopie authored
    …make the code harder to read. Minor changes to contain_all_columns in IdentityMap.
    
    Conflicts:
    
    	activerecord/lib/active_record/base.rb
  6. @arturopie

    refactor the checking of the attributes of the record in IdentityMap#…

    arturopie authored
    …add, so it's more readable
  7. @arturopie

    Do not add record to identity map if the record doesn't have values f…

    arturopie authored
    …or all the columns, so we don't get 'MissingAttributeError' later when trying to access other fields of the same record.
  8. @arturopie
Commits on Mar 29, 2012
  1. @spastorino

    Bumping to 3.2.3.rc2

    spastorino authored
Commits on Mar 28, 2012
  1. @spastorino

    Merge pull request #5640 from yahonda/address_ora_00918_with_oracle

    spastorino authored
    Address an error for test_has_many_through_polymorphic_has_one with Oracle
  2. @yahonda

    Change the order argument from ('id') to ('taggings.id')

    yahonda authored
    to address ORA-00918 error
  3. @jonleighton

    Fix #5549.

    jonleighton authored
  4. @tenderlove @jonleighton

    Test for #5549.

    tenderlove authored jonleighton committed
    Cherry-picked from e96d04a.
    
    Conflicts:
    
    	activerecord/lib/active_record/attribute_methods/read.rb
  5. @spastorino

    Merge pull request #5616 from cbartlett/migration-indent

    spastorino authored
    Fix indenting in migration generator
Commits on Mar 27, 2012
  1. @drogus

    Merge pull request #5618 from lest/patch-1

    drogus authored
    force datetime attributes to be changed
Something went wrong with that request. Please try again.