Skip to content
This repository

Add a test to assert autosaving associations doesn't overwrite id accessor methods #9893

Merged
merged 1 commit into from about 1 year ago

2 participants

Jon Rowe Yves Senn
Jon Rowe

This is a bug on v3.2.13 (reported in #9130 ) where newly created associations will overwrite directly set ids. It seems to be fixed on 3-2-stable but this will help with regressions.

Yves Senn
Collaborator
senny commented

@JonRowe ping, what is the status of this PR? Did the fixing commit on master include a test-case to prevent regressions? What was the fixing commit on 3-2-stable? Is this test still necessary?

Jon Rowe

what is the status of this PR?

Noone seems to have looked at it.

Did the fixing commit on master include a test-case to prevent regressions?

No. That's why I wrote this, I was originally attempting to fix a reported bug.

What was the fixing commit on 3-2-stable?

The part of ActiveRecord which had this bug was completely rewritten, no one commit.

Is this test still necessary?

To prevent regressions only.

Yves Senn
Collaborator
senny commented

@JonRowe thanks for the detailed answer. I'm merging this one in.

Yves Senn senny merged commit b23e0d6 into from
Yves Senn senny closed this
Bernd reqorder referenced this pull request from a commit in reqorder/rails
Bernd reqorder Squashed commit of the following:
commit 714cb5a436e72d00ca0e5e6efa4b789c3e6f5b04
Author: Andrew White <andyw@pixeltrix.co.uk>
Date:   Wed Jul 10 16:11:33 2013 +0100

    Add missing require so that DateTime has the right superclass

    If the DateTime core extensions were loaded before the Date core extensions
    then you would get a superclass mismatch as DateTime hasn't been defined
    yet so it gets set to Object by the acts_like core extension.

    Fixes #11206

    (cherry picked from commit 78f7d5b652000dbb1a11d34fe370c3fa82de840c)

commit b775987e72260233c66080483b3c964f9549d094
Author: Andrew White <andyw@pixeltrix.co.uk>
Date:   Tue Jul 9 15:40:59 2013 +0100

    Return local time for backwards compatibility

commit ccad803bf44fe30602a041ff0ab1cbe985bc3840
Author: Andrew White <andyw@pixeltrix.co.uk>
Date:   Tue Jul 9 14:04:49 2013 +0100

    Retain offset and fraction when using Time.at_with_coercion

    The standard Ruby behavior for Time.at is to return the same type of
    time when passing an instance of Time as a single argument. Since the
    an ActiveSupport::TimeWithZone instance may be a different timezone than
    the system timezone and DateTime just understands offsets the best we
    can do is to return an instance of Time with the correct offset.

    It also maintains the correct fractional second value as well.

    Fixes #11350.

    Backports:
    484253515c0e05760541dc48946361185c9e6904
    1b3873730b96035a238dbff7627bd5942e6dc4e7

commit d704c1cb9850bd563b7ad99762e75b9b3cb7aebf
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Tue Jul 9 07:34:58 2013 -0300

    Do not shallow the original exception in exec_cache

    when result_error_field is not defined on result raise the original
    exception.

    Fixes #11260

commit c4ad10e2547c9546d7ed49e4e82ba5cbb7bcf03f
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Mon Jul 8 14:55:25 2013 -0300

    Remove git dependecy

commit 2ce875dfbdebeca33c32dcdc50bf9932dc2aa857
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Mon Jul 8 14:51:19 2013 -0300

    Add license to the gemspec

commit b5830d168b935f2008bc38771b818f79c9aac040
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Sat Jul 6 20:14:50 2013 -0300

    New changelog entries always on the top [ci skip]

commit a72a0eb85b34a2a8d416245b98fd96579eb29cc1
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Sat Jul 6 17:16:14 2013 -0300

    Remove warning of assigned but unused variable

commit 29106ce99c74f5f7d57496ad68e2b16f3f632e35
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Sat Jul 6 17:10:55 2013 -0300

    Skip connection url test when the machine is using socket configuration.

    The connection url parssing don't accept the socket option

commit e359e3ab935d6790d9a1181e6ebe0038ad168b94
Author: Santiago Pastorino <santiago@wyeworks.com>
Date:   Sat Mar 17 12:42:29 2012 -0300

    Add missing require

commit b9771813e37c0034744d4c5b8c0896b2aadbcc80
Merge: 9a8f593 4265f1b
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Mon Jul 1 11:36:19 2013 -0700

    Merge pull request #8881 from carsonreinke/3-2-stable

    3-2-stable ActiveSupport::TaggedLogging logging progname issue

commit 4265f1bccbabc293e87cc8433a5573dcb7fa5a60
Author: Carson Reinke <carson@reinke.co>
Date:   Thu Jan 10 13:36:05 2013 -0500

    Incorrectly providing program name the same as log message even when block is not provided.

commit 9a8f59340b86151b183d6561a94b953371c3daf3
Author: Yves Senn <yves.senn@gmail.com>
Date:   Thu Jun 27 22:00:27 2013 +0200

    unify duplicate CHANGELOG entry

commit 0a55bd7c6bdc4c3022cec858e341f7561ec8554b
Merge: 63d4894 b47f8d0
Author: Yves Senn <yves.senn@gmail.com>
Date:   Thu Jun 27 12:55:36 2013 -0700

    Merge pull request #9173 from senny/backport_perftest_fix

    Backport rails/rails-perftest#2 to fix rake test:benchmark

commit b47f8d035ec6a38a69eb5b3bdb1e27bb40e574c7
Author: Yves Senn <yves.senn@gmail.com>
Date:   Thu Jun 27 20:54:57 2013 +0200

    clear ARGV to prevent mintest autorun errors:

    Minitest expects the first argument in `ARGV` to be the path to a test file.
    Because `rails benchmarker` and `rails profiler` define an on-the-fly test-case,
    using the first `ARGV` to pass the code to execute this results in:

    ```
    /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/test/unit.rb:167:in `block in non_options': file not found: 1000.times{"a string"} (ArgumentError)
    	from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/test/unit.rb:146:in `map!'
    	from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/test/unit.rb:146:in `non_options'
    	from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/test/unit.rb:207:in `non_options'
    	from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/test/unit.rb:52:in `process_args'
    	from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/minitest/unit.rb:891:in `_run'
    	from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/minitest/unit.rb:884:in `run'
    	from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/test/unit.rb:21:in `run'
    	from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/test/unit.rb:326:in `block (2 levels) in autorun'
    	from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/test/unit.rb:27:in `run_once'
    	from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/test/unit.rb:325:in `block in autorun'
    ```

    clearing ARGV after defining the test-case solves this issue.

commit 1db54d7d01ea36a9d8c0c6276d66d04a9a6c2fac
Author: Yves Senn <yves.senn@gmail.com>
Date:   Mon Feb 4 17:16:25 2013 +0100

    Backport rails/rails-perftest#2 to fix rake test:benchmark

commit 63d4894a58825e9d1fb520ec6ac663e4d8529596
Merge: cacfa8e 839efc5
Author: Yves Senn <yves.senn@gmail.com>
Date:   Tue Jun 25 23:42:35 2013 -0700

    Merge pull request #11019 from tkhr/test_case_for_issue_10393

    Add test case for issue #10393 and fix warning message

commit cacfa8e3fb2cff59956a39a2640c8e3ade4b54c6
Author: Yves Senn <yves.senn@gmail.com>
Date:   Wed Jun 26 08:30:40 2013 +0200

    build fix, fall back to old hash syntax

commit 839efc5b6d754697682d5b2bd34ef28b2c5d2adf
Author: chapmajs <glitch@glitchwrks.com>
Date:   Tue Apr 30 23:11:49 2013 -0300

    Allow global override of default STI inheritance column

    This change fixes a bug by which 3.2-STABLE users can't globally override the default STI inheritance column with `ActiveRecord::Base.inheritance_column = 'some_column'`. 3.2-STABLE users are forced to use a deprecated method or monkey patch it otherwise.

    Test case written by tkhr <takehiro0740@gmail.com>.

commit b23e0d66394a7c5442cc1ebbf4f1f2441878a8d2
Merge: cde6ead 0c96169
Author: Yves Senn <yves.senn@gmail.com>
Date:   Tue Jun 25 22:45:36 2013 -0700

    Merge pull request #9893 from JonRowe/add_test_to_assert_association_doesnt_overwrite

    Add a test to assert autosaving associations doesn't overwrite id accessor methods

commit cde6ead573a6f9638bb866935f21d66b05fc712f
Author: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date:   Tue Jun 25 22:04:52 2013 -0300

    Move changelog entry to the top [ci skip]

commit 07c6262c253cd60780735ab813bc255b606facbc
Merge: 27b3883 5519468
Author: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date:   Tue Jun 25 22:03:01 2013 -0300

    Merge pull request #10373 from janko-m/fix-store-accessor

    Fix a bug in ActiveRecord::Store accessors

commit 27b38838467cf47f83caefbddcdb96aceca052ee
Author: Yves Senn <yves.senn@gmail.com>
Date:   Tue Jun 25 18:07:06 2013 +0200

    Revert "Revert "Merge pull request #10901 from armstrjare/fix_query_null_foreign_key_on_new_record_collection_ids_reader""

    This reverts commit 5009b078875e596a2fba7827336f7548aa6e35ac.

    Also updated the CHANGELOG and adjusted the test-case to match the one on master.

commit b0c65978ab0eff0eca8ac374046c26398f144a18
Author: Andrew White <andyw@pixeltrix.co.uk>
Date:   Tue Jun 25 12:24:06 2013 +0100

    Use old style hash syntax for 3-2-stable

commit 622e4ab424ea260cd3ebe3768b1a2a4e5ae1384e
Author: Andrew White <andyw@pixeltrix.co.uk>
Date:   Tue Jun 25 11:00:19 2013 +0100

    Fix shorthand routes where controller and action are in the scope

    Merge `:action` from routing scope and assign endpoint if both `:controller`
    and `:action` are present. The endpoint assignment only occurs if there is
    no `:to` present in the options hash so should only affect routes using the
    shorthand syntax (i.e. endpoint is inferred from the the path).

    Fixes #9856

    Backport of 37b4276

commit ca23e6d4d3e3a14e2e3ec1af46ca2bd2c7d5576c
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Mon Jun 24 16:19:38 2013 -0300

    Add CHANGELOG entry for #10971

    [ci skip]

commit 2553bd785c0b41193257851ac0267515ec3c9dc3
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Mon Jun 17 10:01:03 2013 -0700

    Merge pull request #10971 from dtaniwaki/escape_link_to_unless

    Always escape the result of link_to_unless method

commit 119f27c519d1fbfe47fa266fde50eec47ab56aaa
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Mon Jun 24 16:09:10 2013 -0300

    Fix textile markup

    Closes #11076

    [ci skip]

commit 5009b078875e596a2fba7827336f7548aa6e35ac
Author: Yves Senn <yves.senn@gmail.com>
Date:   Sat Jun 22 12:15:42 2013 +0200

    Revert "Merge pull request #10901 from armstrjare/fix_query_null_foreign_key_on_new_record_collection_ids_reader"

    This reverts commit 6675d713186c270de1c4684bc1e56742ea2e19e1, reversing
    changes made to 919d1a19d5e7871d50c1531351fc3f736bad5d07.

    I missed to check the target branch and wrongly merged it into 3-2-stable directly.

commit 6675d713186c270de1c4684bc1e56742ea2e19e1
Merge: 919d1a1 c2377f7
Author: Yves Senn <yves.senn@gmail.com>
Date:   Sat Jun 22 03:11:19 2013 -0700

    Merge pull request #10901 from armstrjare/fix_query_null_foreign_key_on_new_record_collection_ids_reader

    Fixes CollectionAssociation#ids_reader returning incorrect ids for new records

commit c2377f72d2c7df1103eac73b0eb3781c02ef2e18
Author: Jared Armstrong <jared.armstrong@gmail.com>
Date:   Mon Jun 10 15:45:58 2013 +1200

    Fixes CollectionAssociation#ids_reader returning incorrect ids for new records

commit 919d1a19d5e7871d50c1531351fc3f736bad5d07
Merge: b768647 f3b84e2
Author: Xavier Noria <fxn@hashref.com>
Date:   Thu Jun 20 14:48:44 2013 -0700

    Merge pull request #11033 from robin850/patch-1

    Update the feedback instructions

commit f3b84e2d9600abce51cd31f85fa173d688b3340e
Author: Robin Dupret <robin.dupret@gmail.com>
Date:   Thu Jun 20 21:11:50 2013 +0300

    Update the feedback instructions [ci skip]

    Since docrails as moved from lifo/docrails to rails/docrails we have
    to ask for commit rights or submit patches directly to the rails
    repository

commit b768647aa89b81137084e0847ff79bbea592e483
Merge: 9f754e8 31899da
Author: Yves Senn <yves.senn@gmail.com>
Date:   Wed Jun 19 02:19:51 2013 -0700

    Merge pull request #10883 from ifeelgoods/3-2-stable

    The default cache store is :file_store in caching_with_rails.textile

commit 31899da15955c54cf61f582911602a987a069505
Author: Matthieu Paret <matthieuparet69@gmail.com>
Date:   Fri Jun 7 12:27:15 2013 +0300

    indicate the default Rails cache store
    memory_store is the default cache store implementation if you call
    ActiveSupport::Cache.lookup_store without arguments.

commit 9f754e801f82aad8db760786ad3eb72cc7993108
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Sun Jun 16 22:02:29 2013 -0300

    Compare host scheme using case-insensitive regexp

    Before:

        image_tag("HTTP://google.com")
        # => "<img alt=\"Google\" src=\"/assets/HTTP://google.com\" />"
        image_tag("http://google.com")
        # => "<img alt=\"Google\" src=\"http://google.com\" />"

    After:

        image_tag("HTTP://google.com")
        # => "<img alt=\"Google\" src=\"HTTP://google.com\" />"
        image_tag("http://google.com")
        # => "<img alt=\"Google\" src=\"http://google.com\" />"

    Backport of #10969

commit 7092467f064832907f8de53b9da659b6de10d7e8
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Sat Jun 15 11:40:12 2013 -0300

    nokogiri >= 1.6 doesn't work with ruby 1.8

commit a51d4e6c25d1e76327665db0c897094a5308d4ef
Author: Yves Senn <yves.senn@gmail.com>
Date:   Sat Jun 15 14:51:17 2013 +0200

    Merge pull request #10925 from senny/10917_test_to_prevent_regression

    regression test + mysql2 adapter raises correct error if conn is closed.
    Conflicts:

    	activerecord/CHANGELOG.md

commit f42e0fd3f4d3e2f4b806b001b6ed88c8da8cd833
Author: Andrew White <andyw@pixeltrix.co.uk>
Date:   Sat Jun 8 08:22:29 2013 +0100

    Override Time.at to work with Time-like values

    Time.at allows passing a single Time argument which is then converted
    to an integer. The conversion code since 1.9.3r429 explicitly checks
    for an instance of Time so we need to override it to allow DateTime
    and ActiveSupport::TimeWithZone values.

commit 20daaf4e2ab30762eeaf023e4870f5a10c34c534
Author: Aaron Patterson <aaron.patterson@gmail.com>
Date:   Wed Jun 5 17:14:55 2013 +0900

    adding a test for #10830

commit 8799cfa72d071fe6ce78fa7dbbf5dd3c9d763a68
Author: Andrew White <andyw@pixeltrix.co.uk>
Date:   Fri May 24 13:02:19 2013 +0100

    Restore rescue block for when IM is enabled

commit 7101a857b46e1c8aa3b9dd9641c4fc5b28a143e6
Merge: d293990 0e14973
Author: Andrew White <andyw@pixeltrix.co.uk>
Date:   Fri May 24 03:35:20 2013 -0700

    Merge pull request #10745 from arunagw/build_fix_ruby187

    Build fix ruby187

commit 0e14973a3368945d9a7fddb4bfeefe3fc2f2a246
Author: Arun Agrawal <arunagw@gmail.com>
Date:   Fri May 24 11:20:43 2013 +0200

    It's scoped in 3-2-stable!

    scope => scoped

commit b75c8e58ab2ea055324c6f95127b5b940e758d57
Author: Arun Agrawal <arunagw@gmail.com>
Date:   Fri May 24 11:20:20 2013 +0200

    Using 1.8.7 syntax for 3-2-stable

commit d29399061e54092fdbf57780c38e19dd1921f45d
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Thu May 23 06:58:10 2013 -0700

    Merge pull request #10713 from senny/10693_fix_primary_key_option_on_has_many

    Fix the `:primary_key` option for `has_many` associations.
    Conflicts:
    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/associations/has_many_association.rb

commit f8c4805a8247a62594d29c5f3ef634d57d2abbf1
Merge: b0f96d4 c236246
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Wed May 22 15:38:15 2013 -0700

    Merge pull request #10681 from jholton/3-2-stable-fix_association_auto_save

    autosave_association issue that occurs when table has unique index (3.2.x backport)

commit b0f96d4436619b25b8024cc70a71c77bcfc12bf6
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Mon May 20 11:15:46 2013 -0700

    Merge pull request #10646 from kennyj/fix_am_20130517

    Fix ActionMailer testcase break with mail 2.5.4.
    Conflicts:
    	actionmailer/CHANGELOG.md
    	actionmailer/test/mailers/base_mailer.rb

commit c2362461cdf9615d5704d6f2942921b84b854c3c
Author: Johnny Holton <johnny@holton.co>
Date:   Sat May 18 18:16:38 2013 -0400

    destroys association records before saving/inserting new association records

    This is a backport of #10417

    fixes bug introduced by  #3329
    These are the conditions necessary to reproduce the bug:
    - For an association, autosave => true.
    - An association record is being destroyed
    - A new association record is being created.
    - There is a unique index one of the association's fields.
    - The record being created has the same value as the record being
    destroyed on the indexed field.

    Before, the deletion of records was postponed until after all
    insertions/saves.  Therefore the new record with the identical value in
    the indexed field caused a non-unique value error to be thrown at the
    database
    level.

    With this fix, the deletions happen first, before the insertions/saves.
    Therefore the record with the duplicate value is gone from the database
    before the new record is created, thereby avoiding the non-uniuqe value
    error.

commit 0d8dbd131b551051ce35379093832fa12fb0cf10
Merge: 5b020fa ec55866
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Wed May 15 18:00:11 2013 -0700

    Merge pull request #10578 from dingle/lu/back_port_to_json_fix

    Support include_root_in_json for ActiveResource properly.

commit ec55866e398feb1a52701027ab86857b62622ab6
Author: Xinjiang Lu <xinjiang.lu@gmail.com>
Date:   Sun May 12 12:10:02 2013 -0400

    Support include_root_in_json for ActiveResource properly.

    This commit is a backport from
    https://github.com/rails/activeresource/pull/29. The
    ActiveResource's include_root_in_json option is broken for 3.2.x.

commit 5b020fa1101b878e5f3b8b8a5e7d47e39b505b1e
Merge: 010ea71 23c656c
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Tue May 14 07:21:30 2013 -0700

    Merge pull request #10616 from Empact/backport-distinct-distinct

    Backport a super-simplified version of #6792, fixing that #exists? can produce invalid SQL: "SELECT DISTINCT DISTINCT"

commit 23c656c1bc113e5f198464ad29d72c5238bfd796
Author: Ben Woosley <ben.woosley@gmail.com>
Date:   Tue May 14 15:01:20 2013 +0200

    Backport a super-simplified version of #6792, fixing
    that #exists? and others can produce invalid SQL: "SELECT DISTINCT DISTINCT"

    The combination of a :uniq => true association and the #distinct call
    in #construct_limited_ids_condition combine to create invalid SQL, because
    we're explicitly selecting DISTINCT, and also sending #distinct on to AREL,
    via the relation#distinct_value.

    Where #6792 was the forever fix, this is the minimal fix. Instead of
    properly indicating the distinctness of the query through #uniq_value alone,
    we use a literal select statement and set #uniq_value to always be falsey

commit 010ea715f2a629059117054f8079a5a1f60f30f6
Author: Mikel Lindsaar <mikel@reinteractive.net>
Date:   Tue May 14 15:01:31 2013 +1000

    Update mail to minimum version 2.5.4

commit b1fb8efd9b541117af327b9c06f79f088442ba18
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Sun May 12 18:45:57 2013 -0300

    Improve CHANGELOG entries

    [ci skip]

commit 442b7c8ccfe107e05b309e1ef72b760716fa4cba
Merge: 5919a55 38af354
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Sun May 12 15:13:47 2013 -0300

    Merge pull request #7695 from benolee/backport_cc7dd66_and_c0ba0f0

    backport runner fixes to 3-2-stable

    Conflicts:
    	railties/CHANGELOG.md

commit 5919a552e4e4203b8d5eb5234428bc00dd462c49
Merge: 5c6cf4e c09829e
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Sat May 11 20:48:21 2013 -0700

    Merge pull request #10303 from ahorner/3-2-stable

    Preserve context for joins while merging relations

commit c09829e03db611b46bb52e2054991222cf57bfbe
Author: Andrew Horner <andrew@tablexi.com>
Date:   Thu Apr 18 23:41:58 2013 -0500

    Preserve context for joins while merging relations

    This is a backport of #10164, already merged into
    master. The issue is described in lengthy detail
    in issues #3002 and #5494.

commit 5c6cf4e59e3e9c75395541162f2741b82347af0a
Merge: e2804c6 ddaa5d5
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Sat May 11 16:01:44 2013 -0700

    Merge pull request #10571 from dasch/dasch/restore-explain-fix

    Don't try to EXPLAIN select_db calls

commit ddaa5d5181e8ed576c4a033062545b0d41a7da72
Author: Daniel Schierbeck <dasch@zendesk.com>
Date:   Sat May 11 16:14:49 2013 +0200

    Don't try to EXPLAIN select_db calls

    Now with a non-broken test.

commit e2804c62dfdd1946a11048196ea32aae17a7edd5
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Sat May 11 18:47:15 2013 -0300

    Add CHANGELOG entry removed by mistake [ci skip]

commit 0549ebea223beeb68c09ac9656579f02e893c0f7
Author: Xavier Noria <fxn@hashref.com>
Date:   Sat May 11 01:28:06 2013 +0200

    Revert "Don't try to EXPLAIN select_db calls"

    Reason: This was backported, but the test does not pass as is.

    This reverts commit a33d320cf4b57fabd9c299b09c217ee3955ecc77.

commit 0be27b709bd62a2dc5c8998adbfd993ec06790ac
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Fri May 10 14:10:10 2013 -0300

    So not make Fixnum#/ private on Ruby verions less than 1.9.3

    In those version to_date call Fixnum#/, what will cause a failure

commit a59d661a82e684e23fd7295443e5d1264315df2e
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Fri May 10 13:36:42 2013 -0300

    Fix test to ruby 2.0

    The default enconding changed on Ruby 2.0

commit a71119335e312acde8d346ffc8fe109b1a99f4bd
Merge: 4fa8607 afedb09
Author: Andrew White <andyw@pixeltrix.co.uk>
Date:   Fri May 10 08:37:03 2013 -0700

    Merge pull request #10557 from arunagw/pluck-refactor-using-map

    Using map. No need to run query again

commit afedb090f07b0ab4944fdfb2204edeaf9ae98383
Author: Arun Agrawal <arunagw@gmail.com>
Date:   Fri May 10 17:33:47 2013 +0200

    Using map. No need to run query again

commit 4fa860728fe2ed8f248e9f3e89f0a144b8f314c8
Merge: 3589181 a33d320
Author: Xavier Noria <fxn@hashref.com>
Date:   Fri May 10 08:05:54 2013 -0700

    Merge pull request #10555 from dasch/dasch/3-2-stable

    Don't try to EXPLAIN select_db calls

commit a33d320cf4b57fabd9c299b09c217ee3955ecc77
Author: Daniel Schierbeck <dasch@zendesk.com>
Date:   Fri May 10 16:21:59 2013 +0200

    Don't try to EXPLAIN select_db calls

commit 3589181122f1a70abc1acd8c6bf41b46e2be2f5a
Merge: 84c69a1 de5b89d
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Fri May 10 07:06:50 2013 -0700

    Merge pull request #10552 from arunagw/pluck-fixed-3-2-stable

    Pluck fixed 3 2 stable

commit de5b89ddc9f9f45760856a1eb55f53a11d067a74
Author: Arun Agrawal <arunagw@gmail.com>
Date:   Fri May 10 15:41:51 2013 +0200

    Fixed pluck to be working with selects.

    See #9777 for details.

    Previously pluck is not returning what we wanted to
    Added a test also to make sure it's working fine.

    This will also fix the build for 1.8.7 as we
    were doing some sort on hash.

    Thanks @pixeltrix for helping me out.

    Thanks @linduxed for pairing with me.

commit 6ab3c730621035ef60eb117f7f9943f5c8fb4536
Author: Arun Agrawal <arunagw@gmail.com>
Date:   Fri May 10 11:05:07 2013 +0200

    Remove useless else

commit 84c69a165380d4ae92322d4503a5b9a7201f6369
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Wed May 8 23:10:04 2013 -0300

    Revert "Merge pull request #8209 from senny/backport_8176"

    This reverts commit 724020278480855bddfe749c91f1074d4f50f3c6, reversing
    changes made to e4e2bcce75b85fb8c1c49509a17bd5dfe6034c32.

    Conflicts:
    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/relation/calculations.rb
    	activerecord/test/cases/calculations_test.rb

    Reason: This caused a regression since it changed the behavior in a
    stable release.

    Fixes #9777

commit c910388587220e962682b0b9187e79b8f1641c17
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Wed May 8 21:03:37 2013 -0300

    Revert "Remove unicode character encoding from ActiveSupport::JSON.encode"

    This reverts commit 815a9431ab61376a7e8e1bdff21f87bc557992f8.

    Conflicts:
    	activesupport/test/json/encoding_test.rb

    Reason: This was causing a regression where the resulting string is always
    returning UTF-8. Also it changes the behavior of this method on a stable release.

    Fixes #9498.

commit 8218a46adb5d2c360f54d5680966f9d78f5aa4bc
Merge: f8c4a31 8407ab1
Author: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date:   Tue May 7 05:13:49 2013 -0700

    Merge pull request #10496 from arunagw/build-fix-scaffold-generator

    Build fix for scaffold generator

commit 8407ab10f0547175b1d53dab4add1acd706bdfd5
Author: Arun Agrawal <arunagw@gmail.com>
Date:   Tue May 7 12:53:23 2013 +0200

    Build fix for scaffold generator

    3-2 behaves different when scaffolding.

commit f8c4a31e0b35576c49cad16c12ebae270cdb0690
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Mon May 6 22:22:07 2013 -0300

    Merge pull request #10489 from greenriver/ar_counter_cache_multiple_destroy

    Confirm a record has not already been destroyed before decrementing counter cache

    Conflicts:
    	activerecord/CHANGELOG.md

    Conflicts:
    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/associations/builder/belongs_to.rb

commit 0b35a3aacc384a9552832fdf0e5a0f71393ef2d1
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Mon May 6 18:12:13 2013 -0700

    Merge pull request #10478 from cainlevy/patch-1

    use canonical #controller_path logic in controller test cases
    Conflicts:
    	actionpack/lib/action_controller/test_case.rb

commit fb90ce015f5ba0919d1546a77ac65ca2c3539a74
Merge: 3c01a69 5a6d9d5
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Mon May 6 07:27:59 2013 -0700

    Merge pull request #10406 from greenriver/distance_of_time_rational

    Correct time_ago_in_words to handle situation where Fixnum#/ returns a Rational (thanks to mathn)

commit 5a6d9d54917e1311a9aef78a82313c296d821150
Author: Ben Tucker <ben@btucker.net>
Date:   Wed May 1 18:09:04 2013 -0400

    Merging in fix from #8222

commit 3c01a693d9306012883f8319b476dc7f841c4d24
Author: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date:   Sun May 5 07:06:50 2013 -0700

    Merge pull request #10466 from prathamesh-sonpatki/scaffold-assets

    Fix tests related to scaffolding generator with --assets=false switch

commit 927a04da40b3d9b97cb23be7c0820eee629f0f7a
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Sat May 4 06:50:45 2013 -0700

    Merge pull request #10448 from arunagw/bug-fix-scaffold-generator-master

    Fixes Scaffold generator with --assets=false
    Conflicts:
    	railties/CHANGELOG.md

    Conflicts:
    	railties/CHANGELOG.md
    	railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb

commit 5519468523b2017df7b36e608c977920f5a54a88
Author: Janko Marohnić <janko.marohnic@gmail.com>
Date:   Mon Apr 29 20:39:18 2013 +0200

    Fix ActiveRecord::Store not tracking changes

commit 9d7a748a5174224ead4d44aedc3849d1d1e37b18
Author: Aaron Patterson <aaron.patterson@gmail.com>
Date:   Tue Mar 5 14:34:54 2013 -0800

    adding test for the symbol refs

commit ba12ef6ae15208a608733a06b78940ef92f305b8
Author: Aaron Patterson <aaron.patterson@gmail.com>
Date:   Wed Apr 17 11:36:08 2013 -0700

    just clear the caches on clear! rather than replacing. fixes #10251

commit 03d071d3cf9a29708aaceb19f2a7b934a1dec0d1
Author: Aaron Patterson <aaron.patterson@gmail.com>
Date:   Wed Apr 17 11:20:12 2013 -0700

    adding a test for root path in the app

commit dddc093a1a3330a0366f9220f14435b17555a6bb
Merge: 624428b cd548d9
Author: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date:   Wed Apr 17 05:23:03 2013 -0700

    Merge pull request #10246 from prathamesh-sonpatki/3.2.13-https-rubygems

    Using secure source https://rubygems.org when generating new plugin with Rails 3.2

commit cd548d9283c9c54d2d4247610cbaca793ff7b173
Author: Prathamesh Sonpatki <csonpatki@gmail.com>
Date:   Wed Apr 17 12:25:55 2013 +0530

    Use secure source in generated Gemfile for creating new plugin. Closes #10245

commit 624428b27854ebd36361ff9ece00010c084d6bf6
Author: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date:   Tue Apr 16 20:25:33 2013 -0300

    Fix "Scaling Rails Screencasts" link in caching guide

    Closes #10241 [ci skip]

commit 130f96c4322d32ef018d5bc0cf50f12d3e9225c6
Merge: 6823948 efd8631
Author: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date:   Sat Apr 13 15:11:26 2013 -0700

    Merge pull request #9688 from alexeymuranov/doc-nested-attributes-3-2

    3-2-stable documentation: the possibility to use a hash of hashes for nested attributes

commit efd86315a71231f7cfa6510151c6f8cd792f3a22
Author: Alexey Muranov <alexey.muranov@gmail.com>
Date:   Tue Mar 12 17:11:24 2013 +0100

    Document nested attributes as hash of hashes

    Document the possibility to use a hash of hashes for nested attributes for a one-to-many association (in addition to the documented possibility to use an array of hashes).

    Align indentation in comments.

commit 68239487bfbb467d1f7e7e33f493257e041a90a8
Merge: 536f316 a6d9e16
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Thu Apr 11 06:41:49 2013 -0700

    Merge pull request #10172 from senny/10098_backport

    Backport: Correctly parse bigint defaults in PostgreSQL

commit a6d9e16e41906ce656993781d2579c4a848a83a1
Author: Erik Peterson <erik@subwindow.com>
Date:   Thu Apr 4 21:06:52 2013 -0400

    Correctly parse bigint defaults in PostgreSQL, Backpost #10098.

    Conflicts:

    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
    	activerecord/test/cases/schema_dumper_test.rb

commit 536f316cd3586e63675e6aba440763b4f0deee9c
Merge: c9bd202 c35d913
Author: Aaron Patterson <aaron.patterson@gmail.com>
Date:   Tue Apr 9 09:22:42 2013 -0700

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

    * 3-2-later:
      adding test for CVE

commit c9bd2022d42890f97f6f9f5896594f030c491add
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Fri Apr 5 16:43:04 2013 -0300

    Improve the changelog entry [ci skip]

commit dbe25910faabedfeae3e1f284cbfb6af746201c6
Merge: fe58853 44a9aed
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Fri Apr 5 12:53:26 2013 -0700

    Merge pull request #10105 from rmm5t/fix-explicit-name-on-multiple-fields

    Fix explicit names on multiple file fields

commit 44a9aedd7b8d65517b15bbbb7729f3f16991e23f
Author: Ryan McGeary <ryan@mcgeary.org>
Date:   Fri Apr 5 14:51:15 2013 -0400

    Fix explicit names on multiple file fields

    If a file field tag is passed the multiple option, it is turned into an
    array field (appending "[]"), but if the file field is passed an
    explicit name as an option, leave the name alone (do not append "[]").

    Fixes #9830

commit fe588537654adc583d54157b1a5db48786452adf
Author: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date:   Wed Apr 3 20:56:12 2013 -0300

    Fix typo in view name

    Introduced in 2c22376fe04b89e8f34620139720b85a85ce3428

commit e252e0ffe1a410513c36b67fb7729ea56de246c2
Author: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date:   Wed Apr 3 20:54:48 2013 -0300

    Use 1.8 hash style in test views

    Introduced in 2c22376fe04b89e8f34620139720b85a85ce3428

commit e59f3809efd8905183056c0a965b93df52a6f62e
Merge: 2c22376 453c7d6
Author: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date:   Wed Apr 3 15:43:59 2013 -0700

    Merge pull request #7792 from seejee/chained_scopes_preload_properly

    Fixes Issue #7490: Chained scopes will preload properly

commit 453c7d6c47be01c9938af14962279e4cb2d6e506
Author: Chris Geihsler <chris@geihsler.net>
Date:   Sat Sep 29 18:32:56 2012 -0400

    Chained scopes will be preloaded properly. Fixes #7490

commit 2c22376fe04b89e8f34620139720b85a85ce3428
Author: Dmitry Vorotilin <d.vorotilin@gmail.com>
Date:   Wed Jul 11 12:18:52 2012 +0400

    Common behavior with adding formats to lookup_context for TemplateRenderer and PartialRenderer

commit 060fca78970e54b6400296325a212632de727b21
Author: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date:   Sat Mar 30 16:42:52 2013 -0300

    Fix formatting and minor review in AP changelog

    Sentences starting with # are considered headings.

commit bac6928eefffcacc84887aec9a81ec2e642ab42d
Author: Steve Klabnik <steve@steveklabnik.com>
Date:   Fri Mar 29 16:28:04 2013 -0700

    Add attr_accessible to the Getting Started Guide.

    This was brought up in #9995, but is only present in 3-2-stable, since
    mass assignment is removed from Rails 4.

commit e06b4fab8e77f36e534804780eb80eae46587a4a
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Thu Mar 28 13:20:07 2013 -0300

    Removing explain support warning from the Railtie

    This is causing a regression since the Active Record Railtie is trying to
    connect to the development database in the application boot.

    See https://github.com/rails/rails/pull/6197#issuecomment-15199273

commit 75d0a81ffe48030bb8d6fa79f70f5b368f748b7c
Merge: df37c91 dee5915
Author: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date:   Tue Mar 26 19:43:14 2013 -0700

    Merge pull request #9943 from fredwu/test_fix_for_74e59ea

    Fixed test failures on 1.8.7 caused by 74e59ea

commit dee5915aac009b6b6456a81ae7b8927866d0c240
Author: Fred Wu <ifredwu@gmail.com>
Date:   Wed Mar 27 11:29:37 2013 +1100

    Fixed test failures on 1.8.7 caused by 74e59ea

commit df37c91745a3fb241fafa23c03387e33eb82c74f
Merge: dbd26e9 8bd56f0
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Tue Mar 26 15:22:05 2013 -0700

    Merge pull request #9576 from fredwu/backport_fix_explicitly_inheraitance_column_to_3_2_stable

    [Backport to 3-2-stable] Don't reset inheritance_column when setting explicitly.

commit 8bd56f0f7ad2b48a50f12c49d436a469fdbb7135
Author: Fred Wu <ifredwu@gmail.com>
Date:   Wed Mar 27 09:20:04 2013 +1100

    Added changelog for 55e2954

commit 55e295470303a6abcf152f24a1a8c7864dab5ef6
Author: Fred Wu <ifredwu@gmail.com>
Date:   Wed Mar 6 10:45:29 2013 +1100

    Don't reset inheritance_column when setting explicitly.

    This is backported from master (cdfcbc4).

commit dbd26e92a7b943a57c2826a749ae25e3ce9e143c
Merge: 029dd43 74e59ea
Author: Jeremy Kemper <jeremy@bitsweat.net>
Date:   Sun Mar 24 13:19:20 2013 -0700

    Merge pull request #9899 from macksmind/backport_5808

    Backport #5808

commit 74e59ea8b674fac08a6ea4da03e58e29fc57a709
Author: Mack Earnhardt <mack@agilereasoning.com>
Date:   Sun Mar 24 07:54:55 2013 -0400

    Backport #5808

    df36c5f - Fix assert_template assertion with :layout option
    4bd05a7 - Fix assert_template :layout => nil assertion
    0d19a08 - Improve assert_template layout checking

commit 0c96169f590b1b5ca9c180b033e7899e322a0f99
Author: Jon Rowe <hello@jonrowe.co.uk>
Date:   Sun Mar 24 12:32:11 2013 +1300

    test case to assert that associations do not overwrite after create, fixes #9310

commit 029dd435e4e13eb4c9490fc0d65f5f976bdffa0a
Merge: ae2baab 845cc5c
Author: Jon Leighton <j@jonathanleighton.com>
Date:   Fri Mar 22 07:25:24 2013 -0700

    Merge pull request #9873 from senny/use_old_hash_syntax

    use ruby 1.8 Hash syntax [ci skip]

commit 845cc5c78d409a9cad589be09dda100f96544610
Author: Yves Senn <yves.senn@gmail.com>
Date:   Fri Mar 22 15:23:57 2013 +0100

    use ruby 1.8 Hash syntax [ci skip]

commit ae2baab1aa278c065dc742a3ffe65c65a7b87dc9
Merge: 69599b6 c8edd4f
Author: Jon Leighton <j@jonathanleighton.com>
Date:   Fri Mar 22 07:14:17 2013 -0700

    Merge pull request #9870 from senny/9806_eager_loading_regression

    do not reset associations when preloading twice.

commit c8edd4fda45bbc7c99beaaf2d53f4de59c3fac54
Author: Yves Senn <yves.senn@gmail.com>
Date:   Fri Mar 22 15:02:49 2013 +0100

    do not reset associations when preloading twice.

    Closes #9806.

    As the `through_options` always contained `{:order=>nil}` the second time,
    the preloader ran, the association was always reset. This patch only
    adds the `:order` to the `through_options` if it is set.

commit 69599b63de927091faf1d804b6457f65014080d6
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Thu Mar 21 09:33:00 2013 -0300

    Fix test to Ruby 1.8

    Pathname doesn't respond to to_path

commit afe5880fa6e0aa805a9e70f460bdce9ba2bd369f
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Thu Mar 21 09:16:48 2013 -0300

    Improve CHANGELOG entry [ci skip]

commit d1577cfe3d7f01f2876e3cbe682065012246697c
Merge: 38d0647 2c8f349
Author: Aaron Patterson <aaron.patterson@gmail.com>
Date:   Wed Mar 20 16:41:01 2013 -0700

    Merge branch '3-2-stable' into fredwu-slow_view_loading_fix

    * 3-2-stable:
      Merge pull request #9802 from newsline/fix-broken-action-missing
      Remove bad changelog entry from AR [ci skip]
      Wrong exception is occured when raising no translatable exception
      Don't crash exception translation w/ nil result attribute.

    Conflicts:
    	actionpack/CHANGELOG.md

commit 38d06478614adcf68a45947cb162c3152e2d7bb1
Author: Fred Wu <ifredwu@gmail.com>
Date:   Thu Mar 21 09:26:07 2013 +1100

    Added changelog for 687e68d

commit 2c8f34995378e4a18711cf5f947e8465227d3748
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Wed Mar 20 18:14:41 2013 -0300

    Merge pull request #9802 from newsline/fix-broken-action-missing

    Fix missing action_missing

    Conflicts:
    	actionpack/CHANGELOG.md

    Conflicts:
    	actionpack/test/controller/base_test.rb

    Fixes #9799

commit 7e8a74d40125be9d8afc8571ab7e28c67662c484
Author: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date:   Wed Mar 20 12:09:55 2013 -0300

    Remove bad changelog entry from AR [ci skip]

    Introduced in dc2bc388bc8c6c345337052bf0d60f5243d899d4.

commit dc2bc388bc8c6c345337052bf0d60f5243d899d4
Author: kennyj <kennyj@gmail.com>
Date:   Fri Mar 1 01:55:20 2013 +0900

    Wrong exception is occured when raising no translatable exception

    Conflicts:
    	activerecord/CHANGELOG.md

commit be913c3964069fa9ff7c8a615e06705e3a6ec435
Author: Steve Jorgensen <stevej@renewfund.com>
Date:   Mon May 21 09:50:29 2012 -0700

    Don't crash exception translation w/ nil result attribute.

    Exception.result is nil when attempting a query after PostgreSQL
    disconnect, resulting in new exception:
    NoMethodError: undefined method `error_field' for nil:NilClass

commit 687e68d88f5e1a7bb6a2d876fbbc5b8c4571d853
Author: Fred Wu <ifredwu@gmail.com>
Date:   Wed Mar 20 16:13:30 2013 +1100

    Fixed assets loading performance in 3.2.13

    The PR #8756 uses Sprockets for resolving files that already exists on disk, for those files their extensions don't need to be rewritten.

    Fixes #9803

commit 517060ab59c383f912c1be838a6d36afb128288f
Author: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date:   Tue Mar 19 17:57:22 2013 -0300

    Be consistent with quotes in smtp example guide [ci skip]

commit 2011cc64e1bdcc252b96b9637c6283efb9402013
Merge: 493c10e ca6a12d
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Tue Mar 19 09:21:01 2013 -0700

    Merge pull request #9796 from dembskoi/clone_structure

    Reset postgreSQL search path in db:test:clone_structure.

commit ca6a12d6e5a8e1034e8d472fb6652111e1314a70
Author: Alexander <dembskoi@gmail.com>
Date:   Tue Mar 19 19:34:56 2013 +0400

    Reset postgreSQL search path in db:test:clone_structure.
    This patch resets the postgres search path in the structure.sql after
    the structure is dumped in order to find schema_migrations table when
    multiples schemas are used.

    Fixes #945

commit 493c10ea2999557b15e5a1efd523e6c987803750
Merge: 2cf38ae 1b12d08
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Tue Mar 19 07:59:15 2013 -0700

    Merge pull request #9804 from samsonasu/backport_number_to_human_fixes

    Backport #9347 to rails 3.2

commit 1b12d08a0f8489f0f3970f6d5e40ed119127c856
Author: hoffm <m@hof.fm>
Date:   Wed Feb 20 16:15:59 2013 -0500

    Backport #9347 to rails 3.2

commit 2cf38aebacaf78260848a54bfbb5bf5a9b627598
Merge: ef5faeb 8aadc6f
Author: José Valim <jose.valim@plataformatec.com.br>
Date:   Mon Mar 18 19:54:12 2013 -0700

    Merge pull request #9789 from puma/3-2-stable

    Change @env_config to @app_env_config

commit 8aadc6f0f4316d96397ef07876b1c0f9ff7dcf6c
Author: Evan Phoenix <evan@phx.io>
Date:   Mon Mar 18 19:21:13 2013 -0700

    Change @env_config to @app_env_config

    Moral of the story: One must be careful about lazily initializing
    instance variables when subclassing.

    I would like to draw your attention to https://github.com/rails/rails/issues/4652 where
    the reader will see that there appears to be some kind of initialization issue
    in rails.

    The source of this issue is that:
    1) Engine#env_config contains "@env_config ||= ..."
    2) Application#env_config contains "@env_config ||= ..."
    3) Threads are in the picture
    4) Thread A calls Application#env_config, which super's to Engine#env_config
    5) After Engine#env_config returns but before Application#env_config sets @env_config again, Thread B begins running
    6) Thread B calls Application#env_config
    7) Thread B finds @env_config to contain a value (the one set by Engine#env_config) and returns it
    8) Thread B blows up because key set by Application#env_config are there.
    9) People report bugs with puma, thin, rainbows, webrick, etc
    10) Evan becomes tired of seeing these bugs
    11) Evan pours himself a stiff drink, puts on Top Gear(tm), and begins debugging
    12) Evan finds the source of the bug
    13) Evan authors a PR
    14) RIGHT NOW.

    The bug is fixed by simply using a different ivar name in the methods.
    Alternately, Engine#env_config could just return a new Hash each time, not memoizing into @env_config.

    I bid you adieu.

commit ef5faeb4a5d0d3a49e4ac7dc378459cdba5a76b7
Merge: 167b645 0e56c1d
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Mon Mar 18 14:57:13 2013 -0700

    Merge pull request #9785 from claudiob/add-3-2-13-release-date-to-changelogs

    Add release dates to documentation [ci skip]

commit 0e56c1de704370f3a2ef0cf9a2d945330b5653c7
Author: claudiob <claudiob@gmail.com>
Date:   Mon Mar 18 14:51:46 2013 -0700

    Add release dates to documentation [ci skip]

    Set "March 18, 2013" as the release date for 3.2.13

commit 167b645a2a0e983cb681d94adbe17480c824e701
Author: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date:   Mon Mar 18 18:25:45 2013 -0300

    Bring back test and changelog entry from #pluck method and select clause

commit 91942219210bc68d09deea0801e54b9f7c187bc9
Author: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date:   Mon Mar 18 18:27:35 2013 -0300

    Fix method name indent [ci skip]

commit a8e7a009d22f787046954b9e043363940deca3da
Author: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date:   Mon Mar 18 18:18:55 2013 -0300

    Fix changelog conflicts and remove release dates [ci skip]

commit afcd01bf25c0d7742d07b10dd8a465cffef4b9fe
Merge: 491d691 a4b5582
Author: Aaron Patterson <aaron.patterson@gmail.com>
Date:   Mon Mar 18 10:17:04 2013 -0700

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

    * 3-2-13:
      bumping to 3.2.13
      fix protocol checking in sanitization [CVE-2013-1857]
      JDOM XXE Protection [CVE-2013-1856]
      fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855]
      stop calling to_sym when building arel nodes [CVE-2013-1854]
      Merge pull request #9616 from exviva/multiple_select_name_double_square_brackets
      bumping to rc2
      Revert "Merge pull request #8209 from senny/backport_8176"
      Freeze columns only once per Result
      Preparing for 3.2.13.rc1 release
      Update CHANGELOGs for 3.2.13 release.

    Conflicts:
    	actionmailer/CHANGELOG.md
    	actionpack/CHANGELOG.md
    	activemodel/CHANGELOG.md
    	activeresource/CHANGELOG.md
    	activesupport/CHANGELOG.md
    	railties/CHANGELOG.md

commit a4b55827721a5967299f3c1531afb3d6d81e4ac0
Author: Aaron Patterson <aaron.patterson@gmail.com>
Date:   Mon Mar 18 09:23:04 2013 -0700

    bumping to 3.2.13

commit 491d6916c976c40bb8e0f0992f35d85ff7169d89
Merge: 1c2717d f662a74
Author: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date:   Mon Mar 18 08:53:48 2013 -0700

    Merge pull request #9768 from senny/do_not_freeze_number_helper_defaults

    Do not freeze NumberHelper defaults

commit f662a748a5d55159e1fae125a7b28695854141a2
Author: Yves Senn <yves.senn@gmail.com>
Date:   Mon Mar 18 09:34:56 2013 +0100

    do not freeze NumberHelper defaults.

    Closes #9767.

commit 99123ad12f71ce3e7fe70656810e53133665527c
Author: Aaron Patterson <aaron.patterson@gmail.com>
Date:   Fri Mar 15 15:04:00 2013 -0700

    fix protocol checking in sanitization [CVE-2013-1857]

    Conflicts:
    	actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb

commit c0d06633f0eafd1ef8cf51b4913894d6c8c9b58f
Author: Ben Murphy <benmmurphy@gmail.com>
Date:   Fri Feb 8 02:48:22 2013 +0000

    JDOM XXE Protection [CVE-2013-1856]

    Conflicts:
    	activesupport/test/xml_mini/jdom_engine_test.rb

commit ff3b9ca1308056b2c939ce77fbea1c4665f3619e
Author: Charlie Somerville <charlie@charliesomerville.com>
Date:   Wed Feb 13 09:09:53 2013 +1100

    fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855]

commit f980289fd2c1b9073a94b5d49b780a49f5e2933c
Author: Aaron Patterson <aaron.patterson@gmail.com>
Date:   Tue Mar 5 14:52:08 2013 -0800

    stop calling to_sym when building arel nodes [CVE-2013-1854]

commit 1c2717d3f5a3ce0ea97f832d1d008e053ad47acd
Author: Justin <justin@brightal.com>
Date:   Fri Mar 15 13:26:08 2013 +0530

    Typo fix [ci ski]

    Closes #9730.

commit 9d5699a05ca625d531988d563d2eda7e4b290fed
Merge: 3d4d742 ce75569
Author: Steve Klabnik <steve@steveklabnik.com>
Date:   Thu Mar 14 14:07:19 2013 -0700

    Merge pull request #7368 from jbarreneche/bug/render-locale-fallbacks

    i18n locale fallback for localized views

commit ce755697fc926b7fa5c783a27ca814574045c961
Author: Juan Barreneche <snipperme@gmail.com>
Date:   Thu Mar 14 18:02:20 2013 -0300

    Extract hardcoded lists to Redo::RestaurantsList

commit 3d4d7420ae43a35ae01343ced6d7c685d0b667ee
Author: Andrew White <andyw@pixeltrix.co.uk>
Date:   Wed Mar 13 07:24:21 2013 +0000

    Fix ar:mysql2 build on Ruby 1.8.7

    The `skip` method is a no-op on Ruby 1.8.7 so we still need to
    force skip by returning early from each test.

commit ba910d76509158d531c637c4ab777beb8b20e53d
Author: Andrew White <andyw@pixeltrix.co.uk>
Date:   Wed Mar 13 04:45:47 2013 +0000

    Fix `ActiveSupport::TimeZone.parse` when time is a local DST jump

    The previous implementation `ActiveSupport::TimeZone.parse` used `Time.parse`
    which applies the system time DST rules to the parsed time. Instead we now
    use `Time.utc` and manually apply the offset.

    Backport tests from:
    005d910624bbfa724b638426a000c8074d4201a2
    c89b6c4cdce7ee55ed3665c099d914222fe0344a
    03becb13099c439f6aea5058546bc8b0b19b8db8

    Fixes #9678.

commit 488699166c3558963fa82d4689a35f8c3fd93f47
Author: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date:   Sat Mar 9 06:48:04 2013 -0800

    Merge pull request #9616 from exviva/multiple_select_name_double_square_brackets

    Fix incorrectly appended square brackets to a multiple select box

    Before:

        select(:category, [], {}, {:multiple => true, :name => "post[category][]"})
        # => <select name="post[category][][]" ...>

    After:

        select(:category, [], {}, {:multiple => true, :name => "post[category][]"})
        # => <select name="post[category][]" ...>

    Conflicts:
    	actionpack/CHANGELOG.md
    	actionpack/lib/action_view/helpers/tags/base.rb
    	actionpack/test/template/form_options_helper_test.rb

commit a0c3c1e1f796c215685e4e4bcd3e8c9178936492
Author: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date:   Sat Mar 9 06:48:04 2013 -0800

    Merge pull request #9616 from exviva/multiple_select_name_double_square_brackets

    Fix incorrectly appended square brackets to a multiple select box

    Before:

        select(:category, [], {}, {:multiple => true, :name => "post[category][]"})
        # => <select name="post[category][][]" ...>

    After:

        select(:category, [], {}, {:multiple => true, :name => "post[category][]"})
        # => <select name="post[category][]" ...>

    Conflicts:
    	actionpack/CHANGELOG.md
    	actionpack/lib/action_view/helpers/tags/base.rb
    	actionpack/test/template/form_options_helper_test.rb

commit 348d693c6a846994f0f06ce307f23374101b25f6
Merge: 8f5c750 c8918c6
Author: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date:   Fri Mar 8 07:43:24 2013 -0800

    Merge pull request #9613 from arunagw/remove_fixme

    Removing FIXME

commit c8918c6972d122531a5ae750ae1b22ff7d539f10
Author: Arun Agrawal <arunagw@gmail.com>
Date:   Fri Mar 8 15:50:34 2013 +0100

    Removing FIXME

    As we did in master.

commit 8f5c7509d6343d740e09364bef34ee984def0760
Merge: 075d0e2 3033dbe
Author: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date:   Fri Mar 8 04:41:21 2013 -0800

    Merge pull request #9609 from arunagw/using-latest-arjdbc

    Using latest AR-JDBC for JRuby

commit 3033dbed284c40678670fac232af9eefaf09a282
Author: Arun Agrawal <arunagw@gmail.com>
Date:   Fri Mar 8 11:22:27 2013 +0100

    Using latest AR-JDBC for JRuby

    1.2.5 and 1.2.6 are bad ones

commit 075d0e2c3f7d5b3b121fb833fc774e41e9505962
Merge: 9bd5c86 f01f03e
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Thu Mar 7 11:49:56 2013 -0800

    Merge pull request #9600 from larrylv/fix-load-target-with-identity-map-on

    @target might be nil when Identity Map is enabled.

commit f01f03e96390fb493830337571de578241619d4f
Author: Larry Lv <larrylv1990@gmail.com>
Date:   Fri Mar 8 03:37:01 2013 +0800

    @target might be nil when Identity Map is enabled.

    * With Identity Map enabled, NameError might be raised and @target is
      nil. So we should always ensure `@target ||= find_target`.

    * Only force reload target when it is stale.

commit 9bd5c86c3bdc70bf29be7f756d1dec2fdd4eaaf0
Merge: bb0007f 939b896
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Thu Mar 7 08:23:23 2013 -0800

    Merge pull request #9549 from larrylv/reload-stable-target-before-saving

    Fix issue #7526. Reload the association target if it's stale.

commit bb0007f70420445f140004587aa1228895ab6653
Merge: 51ae6f4 5d57b82
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Thu Mar 7 06:07:24 2013 -0800

    Merge pull request #9594 from yahonda/3-2-stable_prefix_suffix

    Use shorter prefix and suffix to support Oracle adapter

commit 5d57b821d04eab3fd9b4bdf78254dc428d203be7
Author: Yasuo Honda <yasuo.honda@gmail.com>
Date:   Thu Mar 7 06:41:41 2013 +0900

    Use shorter prefix and suffix as in Oracle database identifier
    cannot be larger than 30 characters

commit ccf256d8dcc68d975bbf00780c3b4096f47e29d3
Author: Aaron Patterson <aaron.patterson@gmail.com>
Date:   Wed Mar 6 15:05:13 2013 -0800

    bumping to rc2

commit 1b699fc8ad0eaf3503ec095413866ec5e4794162
Author: Aaron Patterson <aaron.patterson@gmail.com>
Date:   Tue Mar 5 11:33:16 2013 -0800

    Revert "Merge pull request #8209 from senny/backport_8176"

    This reverts commit 724020278480855bddfe749c91f1074d4f50f3c6, reversing
    changes made to e4e2bcce75b85fb8c1c49509a17bd5dfe6034c32.

    Conflicts:
    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/relation/calculations.rb
    	activerecord/test/cases/calculations_test.rb

commit 51ae6f4bb19014dc081b75864cbede1d612c02d2
Author: Steve Klabnik <steve@steveklabnik.com>
Date:   Tue Mar 5 11:22:55 2013 -0800

    Update CHANGELOGs for 3.2.13.rc1

commit b5445247ad19ee0fb7f9a5ca31fd654cdaf6b005
Author: Santiago Pastorino <santiago@wyeworks.com>
Date:   Thu Sep 20 12:59:31 2012 -0300

    Freeze columns only once per Result

    Conflicts:
    	activerecord/lib/active_record/result.rb

commit 0df96475973cf94b178de1825d935f42a6bd642e
Merge: 927e649 d0f22a9
Author: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date:   Tue Mar 5 04:18:02 2013 -0800

    Merge pull request #9543 from maximerety/backport_fix_7774

    Backported #7774 to 3-2-stable

commit d0f22a99f9f24d07990e02da55ed937c98d41e03
Author: maximerety <maxime.rety@gmail.com>
Date:   Mon Mar 4 16:41:07 2013 +0100

    Backport fixes about #7774 to 3-2-stable

    Fix ActionDispatch::Request#formats when HTTP_ACCEPT header is an empty
    string.

commit 939b896a06c0cff661076d0ca3fbe8c1d5552e83
Author: larrylv <larrylv1990@gmail.com>
Date:   Mon Mar 4 17:38:22 2013 +0800

    Fix issue #7526. Reload the target if it's stale.

    * This has been fixed at master via `365b8b6`, but not at 3-2-stable branch.

    * @stale_state should be nil when a model isn't saved. via `0f3901e`.

    * set @stale_state to nil when reset the target.

commit 927e649bc9dc5740285e4b4e9899421c2bbfefbe
Merge: 0108eaf 1129cb3
Author: Guillermo Iguaran <guilleiguaran@gmail.com>
Date:   Sun Mar 3 11:35:33 2013 -0800

    Merge pull request #9531 from erik-escobedo/patch-1

    Fix typo on ActionPack's ChangeLog

commit 0108eaf3c1f4a769343889d5ef3e69045437c9b7
Merge: d2b9862 98739cf
Author: Andrew White <andyw@pixeltrix.co.uk>
Date:   Sun Mar 3 11:34:23 2013 -0800

    Merge pull request #9528 from korny/patch-1

    Fix unused variable warning in mapper.rb

commit 1129cb31d73a9e291c179b85b3414119799046d2
Author: Érik Escobedo <erik.escobedo.e@gmail.com>
Date:   Sun Mar 3 13:33:45 2013 -0600

    Fix typo on CHANGELOG.md

commit 98739cf45fbcf2bbaa53bdf23bf4aa0250eca1c7
Author: Kornelius Kalnbach <murphy@rubychan.de>
Date:   Sun Mar 3 19:14:37 2013 +0100

    remove unused path_without_format variable

    Was forgotten in a72dab0.

commit d2b9862b247693af16ad00e56d4510ef460bcea7
Author: Santiago Pastorino <santiago@wyeworks.com>
Date:   Thu Sep 20 12:59:31 2012 -0300

    Freeze columns only once per Result

    Conflicts:
    	activerecord/lib/active_record/result.rb

commit 2e2f8c07d0ee9b209c35e41f69a44c50c501344a
Author: Yves Senn <yves.senn@gmail.com>
Date:   Thu Feb 28 08:59:07 2013 +0100

    Update docs, change_table does not use TableDefinition.

    [ci skip]

    Conflicts:
    	activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb

commit 9756aa640f505df35fbd829b5d938c4ed4a26e1e
Author: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date:   Thu Feb 28 09:03:37 2013 -0300

    Improve AR changelog [ci skip]

commit 5e1d629ff66dc433aa50a10130e477060da13bf8
Merge: 641a27d 3170d2b
Author: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date:   Thu Feb 28 04:00:38 2013 -0800

    Merge pull request #9485 from authorNari/backport-6755-to-3-2-stable

    Backported #6755 to 3-2-stable. Don't read csv file during executing db:fixtures:load.

    CSV fixtures have already been removed some time ago in 1716da07204193c8acf967e2d75a53a82e4c7c28, but the task was still loading them, even though later it tried to find the related yaml file.

commit 3170d2b7689f2e7f63bac4a5dee050ca03005678
Author: Narihiro Nakamura <authornari@gmail.com>
Date:   Thu Feb 28 18:00:15 2013 +0900

    Backported #6755 to 3-2-stable. Don't read csv file during executing db:fixtures:load.

commit 641a27d47baf4804e89d5a99ee6d843a75d868e6
Author: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date:   Wed Feb 27 21:03:59 2013 -0300

    Enforce i18n version >= v0.6.4

    v0.6.2 and v0.6.3 both have issues with Ruby 1.8.7, see
    https://github.com/svenfuchs/i18n/issues/192 for more info.

commit a1f18d3d722430d83783763eebe25fb05e8ce55c
Merge: 6a65a8c c27da1f
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Wed Feb 27 13:12:47 2013 -0800

    Merge pull request #9472 from yahonda/revert_7544c7a9

    Revert "Skip test_remove_column_with_array_as_an_argument_is_deprecated ...

commit c27da1fbcc243613949c682c44f05fffa71519c4
Author: Yasuo Honda <yasuo.honda@gmail.com>
Date:   Thu Feb 28 05:43:01 2013 +0900

    Revert "Skip test_remove_column_with_array_as_an_argument_is_deprecated with Oracle adapter."

    This reverts commit 7544c7a9f290a3ea25099ae38d52795458391785.

    Oracle enhanced adapter is supporting remove_column with Array.

commit 6a65a8caf38fb7a46521ffbc66ea6f375a0add89
Merge: 197b9f4 97df33d
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Wed Feb 27 12:36:04 2013 -0800

    Merge pull request #9471 from yahonda/5837_32-stable

    Fix ORA-00972 error at test_rename_table_with_prefix_and_suffix

commit 97df33d818602d452a0873e0affe0263ed3c2abb
Author: Yasuo Honda <yasuo.honda@gmail.com>
Date:   Thu Feb 28 05:22:08 2013 +0900

    Fix ORA-00972 error at test_rename_table_with_prefix_and_suffix

    backport pull request#5837 to 3-2-stable

commit 5ca59b02d1cc80f3463eef062ced079eb1b3998c
Author: Steve Klabnik <steve@steveklabnik.com>
Date:   Wed Feb 27 12:19:06 2013 -0800

    Preparing for 3.2.13.rc1 release

commit 23434f6162304292e8c4e28f2744e2cce719b372
Author: Steve Klabnik <steve@steveklabnik.com>
Date:   Wed Feb 27 10:01:29 2013 -0800

    Update CHANGELOGs for 3.2.13 release.

commit 197b9f4d61260bea9e2a0a4883977e02164a0667
Author: Steve Klabnik <steve@steveklabnik.com>
Date:   Tue Feb 26 20:28:35 2013 -0800

    Tighten up AS.gemspec.

    Apparently 0.6.2 has a call to force_encoding, which is not around
    in 1.8.7.

commit 1a88523f862738d4c270ab0134ed200c879d1f48
Author: Steve Klabnik <steve@steveklabnik.com>
Date:   Tue Feb 26 17:09:23 2013 -0800

    CHANGELOG entry for ee291b9.

    Since we released it, it should go in the CHANGELOG.

commit ee291b9b41a959e557b7732100d1ec3f27aae4f8
Author: Steve Klabnik <steve@steveklabnik.com>
Date:   Tue Feb 26 16:57:18 2013 -0800

    Revert "Merge pull request #9208 from dylanahsmith/3-2-mysql-quote-numeric"

    This reverts commit 921a296a3390192a71abeec6d9a035cc6d1865c8.

commit 55a1765942bc3d78ba5d449b5daf17a3c902e57c
Author: Hiroshige Umino <hiroshige88@gmail.com>
Date:   Tue Feb 26 11:32:04 2013 +0900

    Do not override attributes on `dup` by default scopes

commit c90e24d08782d583286ccb21cc15f60fa9ed8367
Author: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date:   Tue Feb 26 08:38:12 2013 -0300

    Improve changelog entry [ci skip]

commit 06eb872035a115852d92121c037e3c54a7a10f58
Merge: 0761bb0 905b7df
Author: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date:   Tue Feb 26 03:36:06 2013 -0800

    Merge pull request #9430 from authorNari/backport-7072-to-3-2-stable

    Backported #7072 to 3-2-stable. Use database value for uniqueness validation scope

commit 905b7df1fac8332547b9eb7fc4d5b083c6fc1031
Author: Narihiro Nakamura <authornari@gmail.com>
Date:   Tue Feb 26 14:39:26 2013 +0900

    Backported #7072 to 3-2-stable. Use database value for uniqueness validation scope.

commit 0761bb029886bb6920a404ecf409013f83a44f58
Merge: e9d6592 6df2db3
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Sun Feb 24 18:58:25 2013 -0800

    Merge pull request #9408 from mikeycgto/origin/3-2-stable

    Update RUBY_VERSION check for performance testing to handle 2.0.0

commit 6df2db329889590d516fa12307a5dddda59068d1
Author: mikeycgto <mikeycgto@gmail.com>
Date:   Sun Feb 24 21:43:32 2013 -0500

    Update RUBY_VERSION check for performance testing to handle 2.0.0

commit e9d659224bb6610d726bd333a9425b4f8f5796ba
Merge: 2647a3c 2a12a04
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Sun Feb 24 15:12:13 2013 -0800

    Merge pull request #9406 from rails/3-2-stable-ruby-2

    Rails 3.2.x is now compatible with Ruby 2.0.0

commit 2a12a04a54590d3a5f2abf4cd4eff3a7b1ee6ef4
Author: Prem Sichanugrist <s@sikac.hu>
Date:   Sun Feb 24 16:33:18 2013 -0500

    Rails 3.2.x is now compatible with Ruby 2.0.0

commit 621b5b7f0e608bc916a66a6e046f11485317949c
Author: SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
Date:   Sat Dec 29 14:07:09 2012 +0900

    added marshal_load and marshal_dump for ProxyTestResult. Behavior of method_missing with Marshal.dump and Marshal.load is changing in ruby 2.0.0 later.

commit 8598633cc1d5ea402f8b49b1f71cd92180cc1138
Author: Prem Sichanugrist <s@sikac.hu>
Date:   Fri Feb 22 17:29:08 2013 -0500

    Do not redirect cache logger to /dev/null in test

    For some reason, redirecting cache's logger to '/dev/null' resulting in
    a test failures and LoadError. I think it's because of Thread issue.
    Instead of trying to make every logger threadsafe for Rails 3.2, I think
    it's better to just don't set the logger for now.

    (Note: resetting the logger back to original value in the teardown block
    didn't fix the problem.)

commit 5693d444686d84d403de5af5d3e23ffe8147001d
Author: Jeremy Kemper <jeremy@bitsweat.net>
Date:   Sat Oct 6 20:57:22 2012 -0700

    Ruby 2 compat. Hash[] now raises on bad elements rather than ignoring them. No sense over-testing this MRI-specific behavior. See ruby/ruby@8d6add973ebcb3b4c1efbfaf07786550a3e219af

commit 0190dcae3c7d4dba5d8b322c04236feea22fc0f9
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Mon Nov 5 15:12:09 2012 -0200

    Make the tests pass with minitest 4.2

commit 979e198c14a95010aca17b6e640f386961360794
Author: Prem Sichanugrist <s@sikac.hu>
Date:   Fri Feb 22 14:26:20 2013 -0500

    Check for `method_missing` in public and protected

    Ruby 2.0 changed the behavior of `respond_to?` without argument to
    return only search for public method. We actually want to perform the
    action only if `method_missing` is either in public or protected.

commit abf0c710210440e50b33b3e708b1e7e1dfbf9d65
Author: thedarkone <thedarkone2@gmail.com>
Date:   Sat Jun 30 17:09:12 2012 +0200

    There is already a Set of non-hidden action_names lying around.

commit 42d7927c22a2c219d6145d9375be65a04a83dce3
Author: Jeremy Kemper <jeremy@bitsweat.net>
Date:   Sat Oct 6 21:06:10 2012 -0700

    Ruby 2 compat. CGI.escapeHTML has changed the way it escapes apostrophes a few times, so fix up the test to work with however it chooses to escape.

commit 2a5f6d8fe6898f2570ba66382336d56894a43322
Author: Aaron Patterson <aaron.patterson@gmail.com>
Date:   Mon Nov 12 18:17:06 2012 -0800

    Ruby 2.0.0 defaults source encoding to utf-8 so we need to specifically tag this file with us-ascii

commit 7cc26fd15e27c4a13705a844538bebfdd0461729
Author: Aaron Patterson <aaron.patterson@gmail.com>
Date:   Tue Mar 20 09:58:42 2012 -0700

    search private and protected methods for convert_key

commit 45e9cac12ca99a51ef10e5ee423a6712818ae145
Author: Prem Sichanugrist <s@sikac.hu>
Date:   Thu Feb 21 21:24:02 2013 -0500

    Define #inspect instead of #to_s

    Ruby 2.0 Object#inspect does not call #to_s by default anymore.

commit b59b72a5aeb799ddaa43dc7ed8ef8101a6c95896
Author: Prem Sichanugrist <s@sikac.hu>
Date:   Thu Feb 21 20:21:24 2013 -0500

    Fix failing test case when no database.yml

commit 9a0cdc68b5b0fc08e60069cb5512bf2ad6b2a76b
Author: Aaron Patterson <aaron.patterson@gmail.com>
Date:   Thu May 24 14:55:38 2012 -0700

    `name` should be public.

commit fe4fce80f3ee80b089fca482f04788af0b9d4d17
Author: Prem Sichanugrist <s@sikac.hu>
Date:   Thu Feb 21 18:47:18 2013 -0500

    Add in missing requires

commit 2647a3cabfb88ac0dac318207bf611b0b66d495f
Merge: 0c1558d 8f6fa34
Author: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date:   Sat Feb 23 06:26:20 2013 -0800

    Merge pull request #9388 from senny/9367_wrong_schema_after_remove_column

    Sqlite preserves primary keys when copying/altering tables.

commit 8f6fa345e5c865acefa063c3e2cd62553fa9f2eb
Author: Yves Senn <yves.senn@gmail.com>
Date:   Sat Feb 23 14:00:02 2013 +0100

    Sqlite preserves primary keys when copying/altering tables.

    Backport #2312.
    Fixes #9367.

    I also added a test-case to make sure that renaming or removing
    a column preserves the primary key.

commit 0c1558d32fe7f3198ef598ce552ea89a04ab7793
Author: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date:   Fri Feb 22 14:42:35 2013 -0300

    Use 1.8 hash style

commit e55b0f6d42ee224513aa0a3e1552268b10e5d182
Merge: fdcd7c0 a72dab0
Author: Andrew White <andyw@pixeltrix.co.uk>
Date:   Fri Feb 22 00:35:28 2013 -0800

    Merge pull request #9374 from senny/improved_match_shorthand_syntax

    determine the match shorthand target early.

commit a72dab0b6a16ef9e83e66c665b0f2b4364d90fb6
Author: Yves Senn <yves.senn@gmail.com>
Date:   Thu Feb 21 17:43:49 2013 +0100

    determine the match shorthand target early.

    Backport #9361.
    Closes #7554.

    This patch determines the `controller#action` directly
    in the `match` method when the shorthand syntax is used.
    this prevents problems with namespaces and scopes.

commit fdcd7c0f2ee264219c322e5cb8f880ca48e14d5f
Author: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date:   Thu Feb 21 12:48:45 2013 -0300

    Change tabs to spaces in form options helper [ci skip]

commit a0d84227c2aa4f509abcfa81880dc1cd7cfa9d05
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Wed Feb 20 22:31:02 2013 -0300

    Use order to get the first record since postgresql returns in the
    desired order

commit 31436206d9fea09f6332d89e7863bc60e8db902f
Merge: b4e053e 9be7f63
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Tue Feb 19 05:58:08 2013 -0800

    Merge pull request #9323 from senny/build_fix_from_9252

    keep the build :green_heart:, #first on 1.8.7 and pg is different

commit 9be7f63db9063b004bc0645df1d49e23ee3ccae9
Author: Yves Senn <yves.senn@gmail.com>
Date:   Tue Feb 19 14:42:45 2013 +0100

    keep the build :green_heart:, #first on 1.8.7 and pg is different

    The build only failed for ruby-1.8.7 and pg. The problem was that the statement:

    ```ruby
    author = Author.includes(:comments_with_order_and_conditions, :posts).first
    ```

    resulted in Author with ID 2 where on all other rubies / db-engines Author with ID 1
    was retunred. Of course this breaks the assertions.

commit b4e053e867232e28c7b99b0d935161d1e4559ced
Merge: 46b65ba 587f563
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Tue Feb 19 04:33:42 2013 -0800

    Merge pull request #9322 from senny/backport_9252

    don't cache invalid subsets when preloading hmt associations.

commit 587f563c40cfada296d6e8d6bbe3c4d7fc6ce93b
Author: Yves Senn <yves.senn@gmail.com>
Date:   Mon Feb 11 21:24:11 2013 +0100

    don't cache invalid subsets when preloading hmt associations.

    Backport #9252.

    Conflicts:

    	activerecord/CHANGELOG.md
    	activerecord/test/cases/associations/eager_test.rb

    The preloader code on 3-2-stable is not based on relations but on option hashes.
    I had to modify the original patch and comparing the option hashes could be more
    fuzzy than comparing the relations. All the tests passed though.

commit 46b65ba274bea6f8d52926e4b243db28d6377fc0
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Mon Feb 18 18:48:39 2013 -0300

    Allow failures to 2.0.0

commit 3c5f631caa160c2e5f4ec3ee0b7536a474b7b98f
Author: Lilibeth De La Cruz <lilibethdlc@gmail.com>
Date:   Fri Jan 25 04:14:27 2013 -0400

    Fix handling of dirty time zone aware attributes

    Previously, when `time_zone_aware_attributes` were enabled, after
    changing a datetime or timestamp attribute and then changing it back
    to the original value, `changed_attributes` still tracked the
    attribute as changed. This caused `[attribute]_changed?` and
    `changed?` methods to return true incorrectly.

    Example:

        in_time_zone 'Paris' do
          order = Order.new
          original_time = Time.local(2012, 10, 10)
          order.shipped_at = original_time
          order.save
          order.changed? # => false

          # changing value
          order.shipped_at = Time.local(2013, 1, 1)
          order.changed? # => true

          # reverting to original value
          order.shipped_at = original_time
          order.changed? # => false, used to return true
        end

    (cherry picked from commit bc982cbcb34129ea2cfe8aa1f8e0b40e444e68db)

    Conflicts:
    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb

    Backport of #9073
    Fixes #8898

commit f7c845745313efc23e9020dea93b5fd9ca104568
Merge: 7f4975f 01b63c7
Author: Xavier Noria <fxn@hashref.com>
Date:   Sat Feb 16 11:24:20 2013 -0800

    Merge pull request #9308 from joernchen/patch-1

    Update activemodel/CHANGELOG.md

commit 01b63c7bc7be8cb155f72e20faeaf213b16f9d85
Author: joernchen of Phenoelit <joernchen@phenoelit.de>
Date:   Sat Feb 16 20:01:54 2013 +0100

    Update activemodel/CHANGELOG.md

    Fixed a typo

commit 7f4975ffc618bc3125039c565507a385c1187183
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Fri Feb 15 13:00:53 2013 -0200

    Revert "Merge pull request #9252 from senny/8423_hmt_preloading_bug"

    This reverts commit c5451777b038c5e48567f69256986ae42a2cde48.

    Conflicts:
    	activerecord/CHANGELOG.md

commit de83b017a90e9fe68da1359a97ac5b58b7c0f3fe
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Thu Feb 14 15:46:28 2013 -0200

    Do not put the version in unreleased changes [ci skip]

commit b9720355d05d61636396578a258c075fba2f854a
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Thu Feb 14 15:36:45 2013 -0200

    Fix the CHANGELOG headers [ci skip]

commit c5451777b038c5e48567f69256986ae42a2cde48
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Thu Feb 14 09:28:55 2013 -0800

    Merge pull request #9252 from senny/8423_hmt_preloading_bug

    don't cache invalid subsets when preloading hmt associations
    Conflicts:
    	activerecord/CHANGELOG.md
    	activerecord/test/cases/associations/eager_test.rb

commit ee3e3a90f31af5845849dc631ff301e79c95b28a
Merge: 4bb579a 6996a04
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Thu Feb 14 09:19:29 2013 -0800

    Merge pull request #9289 from rails/3-2-stable-test-with-ruby-2

    Add Ruby 2.0 RC to Travis CI build matrix

commit 6996a0419c6802d1af9fde067025f6dd798c4dc7
Author: Prem Sichanugrist <s@sikac.hu>
Date:   Thu Feb 14 12:18:33 2013 -0500

    Add Ruby 2.0 RC to Travis CI build matrix

commit 4bb579a5f05788d10bc61920a68700591280ffb4
Author: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date:   Thu Feb 14 13:45:57 2013 -0200

    Fix typo in railties changelog [ci skip]

    Other changelogs were fixed in f15581b1bab8fa042f4614f9b2709c3c580ad9d1.

commit b63eb672ecd86bd2cbc674aa05ac8f7b33e43e81
Merge: d1904af f15581b
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Thu Feb 14 07:38:56 2013 -0800

    Merge pull request #9288 from jmccartie/jm/typos

    Fixed changelog typos [ci skip]

commit f15581b1bab8fa042f4614f9b2709c3c580ad9d1
Author: Jon McCartie <jon@mccartie.com>
Date:   Thu Feb 14 09:14:46 2013 -0600

    Fixed changelog typos [ci skip]

commit c35d913524966409721e96716217daca4e5ef5f3
Author: Aaron Patterson <aaron.patterson@gmail.com>
Date:   Sat Feb 9 17:00:59 2013 -0800

    adding test for CVE

commit 38af3540ae53b9f2fbdb649a68cde3edf182fe67
Author: kennyj <kennyj@gmail.com>
Date:   Tue May 29 23:31:27 2012 +0900

    backport runner fixes to 3-2-stable

    Add a runner hook to Rails::Application and Rails::Engine that requires
    ActiveRecord::Base to avoid circular constant loading when using observers.

    This commit backports cc7dd66, c0ba0f0 and 8d01c61.

Signed-off-by: Bernd <bn@reqorder.com>
65500b2
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Showing 1 unique commit by 1 author.

Mar 23, 2013
Jon Rowe JonRowe test case to assert that associations do not overwrite after create, …
…fixes #9310
0c96169
This page is out of date. Refresh to see the latest.

Showing 1 changed file with 13 additions and 0 deletions. Show diff stats Hide diff stats

  1. +13 0 activerecord/test/cases/autosave_association_test.rb
13 activerecord/test/cases/autosave_association_test.rb
@@ -341,6 +341,19 @@ def test_store_association_with_a_polymorphic_relationship
341 341 assert_equal num_tagging + 1, Tagging.count
342 342 end
343 343
  344 + def test_association_is_not_overwitten_on_autosave
  345 + firm_1 = Firm.create!(name: 'Apple')
  346 + firm_2 = Firm.create!(name: 'Microsoft')
  347 + client = Client.create!(firm: firm_1, name: 'Business')
  348 + assert_equal firm_1.id, client.client_of
  349 +
  350 + client.client_of = firm_2.id
  351 + assert client.save
  352 +
  353 + client.reload
  354 + assert_equal firm_2, client.firm
  355 + end
  356 +
344 357 def test_build_and_then_save_parent_should_not_reload_target
345 358 client = Client.find(:first)
346 359 apple = client.build_firm(:name => "Apple")

Tip: You can add notes to lines in a file. Hover to the left of a line to make a note

Something went wrong with that request. Please try again.