Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Jun 7, 2012
  1. @jonleighton

    Revert "Perf: Don't load the association for #delete_all."

    jonleighton authored
    This reverts commit b98d1e2.
    
    Closes #6609
    
    Conflicts:
    
    	activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
Commits on Jun 4, 2012
  1. @kennyj
Commits on Jun 1, 2012
  1. @tenderlove

    bumping to 3.2.5

    tenderlove authored
  2. @pixeltrix

    Restore behavior of Active Record 3.2.3 scopes

    pixeltrix authored
    A series of commits relating to preloading and scopes caused a regression.
    Cloning the relation calls initialize_copy which resets a number of instance
    variables to nil. Without this the scope thinks that it is already loaded
    when it is called again.
    
    Reverts the following commits:
    13f1401
    8491740
    dffbb52
    
    Fixes #6575, #6576 & #6577
Commits on May 31, 2012
  1. @tenderlove

    Merge branch '3-2-rel' into 3-2-stable

    tenderlove authored
    * 3-2-rel:
      bumping to 3.2.4
      adding security notifications to CHANGELOGs
      updating changelogs
      Merge pull request #6558 from parndt/fix_regression
  2. @tenderlove

    Merge branch '3-2-stable-sec' into 3-2-stable

    tenderlove authored
    * 3-2-stable-sec:
      Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this!
      predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this
      bumping to 3.2.4.rc1
  3. @tenderlove

    bumping to 3.2.4

    tenderlove authored
  4. @tenderlove

    Merge branch '3-2-stable-sec' into 3-2-rel

    tenderlove authored
    * 3-2-stable-sec:
      Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this!
      predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this
  5. @tenderlove

    Merge pull request #6558 from parndt/fix_regression

    tenderlove authored
    Fix regression
  6. @parndt

    Revert "Removes unneeded caching from ActiveRecord::Base.relation"

    parndt authored
    This reverts commit ebfa58a.
    
    This change caused a regression in my application's tests:
    
    * Failing build http://travis-ci.org/#!/resolve/refinerycms/builds/1461242
    
    Broken tests pass after this change is reverted.
Commits on May 30, 2012
  1. @tenderlove

    predicate builder should not recurse for determining where columns.

    tenderlove authored
    Thanks to Ben Murphy for reporting this
    
    CVE-2012-2661
  2. @rafaelfranca

    Merge pull request #6477 from steveklabnik/close_discovered_pg_connec…

    rafaelfranca authored
    …tion
    
    Properly discover a connection is closed in postgresql_adapter
  3. @tenderlove @rafaelfranca

    Merge pull request #5810 from kennyj/fix_5797

    tenderlove authored rafaelfranca committed
    Fix #5797. Error calling dup method on AR model with serialized field
    Conflicts:
    	activerecord/lib/active_record/core.rb
Commits on May 28, 2012
  1. @tenderlove

    bumping to 3.2.4.rc1

    tenderlove authored
Commits on May 25, 2012
  1. @rafaelfranca

    Merge pull request #5244 from fotos/myqsl2_wait_timeout

    rafaelfranca authored
    Maximum wait_timeout on Windows is 2147483
Commits on May 24, 2012
  1. @carlosantoniodasilva

    Merge pull request #5925 from Juanmcuello/pg_structure_dump

    carlosantoniodasilva authored
    Quote arguments in db:structure:dump for PostgreSQL.
Commits on May 23, 2012
  1. Synchronize the ConnectionPool#release method to avoid thread safety …

    Andrew Selder authored
    …issues [#6464]
    
    Fixes #6464
    
    Synchronize the contents of the release method in ConnectionPool due to
    errors when running in high concurrency environments.
    
        Detected invalid hash contents due to unsynchronized modifications
    with concurrent users
        org/jruby/RubyHash.java:1356:in `keys'
    /usr/local/rvm/gems/jruby-1.6.7@new_import/gems/activerecord-3.2.3/lib/a
    ctive_record/connection_adapters/abstract/connection_pool.rb:294:in
    `release'
    
    /usr/local/rvm/gems/jruby-1.6.7@new_import/gems/activerecord-3.2.3/lib/a
    ctive_record/connection_adapters/abstract/connection_pool.rb:282:in
    `checkin'
  2. @Juanmcuello
Commits on May 22, 2012
  1. @chancancode

    Restore the frozen state on rollback. Fixes #6417.

    chancancode authored
    This is a 3-2-stable backport for #6420 which was merged into master.
    
    Currently, when saving a frozen record, an exception would be thrown
    which causes a rollback. However, there is a bug in active record that
    "defrost" the record as a side effect:
    
        >> t = Topic.new
        => #<Topic id: nil, ...>
        >> t.freeze
        => #<Topic id: nil, ...>
        >> t.save
        RuntimeError: can't modify a frozen Hash
        >> t.frozen?
        => false
        >> t.save
        => true
    
    This patch fixes the bug by explictly restoring the frozen state on the
    attributes Hash after every rollback.
Commits on May 21, 2012
  1. @pwnall
Commits on May 20, 2012
  1. @drogus

    Fix uniqueness validator with `allow_nil: false` also for mysql

    drogus authored
    MySQL's adapter was changing value for case sensitive comparison. We
    don't need to do it for `nil`.
  2. @drogus

    Fix `validates_uniqueness_off :field, :allow_nil => false`

    drogus authored
    Closes (#5853)
    
    Uniqueness validator was not properly checking if there are any existing
    records, when value was `nil` and column was text type. `nil` was
    converted to string, which resulted in queries looking like:
    
    ```sql
    SELECT 1 FROM "posts" WHERE "posts"."title" = '' LIMIT 1
    ```
    
    instead of
    
    ```sql
    SELECT 1 FROM "posts" WHERE "posts"."title" IS NULL LIMIT 1
    ```
Commits on May 19, 2012
  1. @tenderlove

    Merge pull request #6398 from pmahoney/threadsafe-connection-pool

    tenderlove authored
    Synchronize read and modification of @reserved_connections
  2. @drogus

    Ensure that CollectionAssociation#replace returns proper target

    drogus authored
    The fix commited in e2a070c was returning the `new_target`, as
    a try to return whatever user replaced association with. The
    problem is, the resulting association target may be ordered
    differently. In such case we want to return the target that
    will be later used for that association.
Commits on May 18, 2012
  1. @ernie
  2. @jonleighton
  3. @jonleighton

    Perf: Don't load the association for #delete_all.

    jonleighton authored
    Bug #6289
    
    Conflicts:
    
    	activerecord/test/cases/associations/has_many_associations_test.rb
Commits on May 17, 2012
  1. @drogus

    Fix CollectionAssociation#replace to return new target (closes #6231)

    drogus authored
    Conflicts:
    
    	activerecord/test/cases/associations/has_many_associations_test.rb
Commits on May 11, 2012
  1. @alexeymuranov
Commits on May 10, 2012
  1. @pixeltrix

    Return false for exists? with new records - fixes #6199.

    pixeltrix authored
    (cherry picked from commit fa21b73)
  2. @jeremy

    Merge pull request #6221 from alexeymuranov/deprecate__instantiate_fi…

    jeremy authored
    …xtures__arity
    
    Deprecate ActiveRecord::Fixtures.instantiate_fixtures unused parameter
Commits on May 9, 2012
  1. @alexeymuranov
  2. @alexeymuranov

    Deprecate ::instantiate_fixtures unused parameter

    alexeymuranov authored
    Deprecate the use of AcitiveRecord::Fixtures::instantiate_fixtures(object, fixture_set_name, fixture_set, load_instances = true), use instead instantiate_fixtures(object, fixture_set, load_instances = true).
    
    To be changed in master branch.
  3. @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
Something went wrong with that request. Please try again.