Permalink
Commits on Feb 23, 2013
  1. Merge pull request #9388 from senny/9367_wrong_schema_after_remove_co…

    …lumn
    
    Sqlite preserves primary keys when copying/altering tables.
    carlosantoniodasilva committed Feb 23, 2013
  2. 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.
    senny committed Feb 23, 2013
Commits on Feb 22, 2013
  1. Merge pull request #9374 from senny/improved_match_shorthand_syntax

    determine the match shorthand target early.
    pixeltrix committed Feb 22, 2013
  2. 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.
    senny committed Feb 21, 2013
Commits on Feb 21, 2013
Commits on Feb 19, 2013
  1. Merge pull request #9323 from senny/build_fix_from_9252

    keep the build 💚, #first on 1.8.7 and pg is different
    rafaelfranca committed Feb 19, 2013
  2. keep the build 💚, #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.
    senny committed Feb 19, 2013
  3. Merge pull request #9322 from senny/backport_9252

    don't cache invalid subsets when preloading hmt associations.
    rafaelfranca committed Feb 19, 2013
  4. 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.
    senny committed Feb 11, 2013
Commits on Feb 18, 2013
  1. Allow failures to 2.0.0

    rafaelfranca committed Feb 18, 2013
Commits on Feb 17, 2013
  1. 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 bc982cb)
    
    Conflicts:
    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
    
    Backport of #9073
    Fixes #8898
    lilibethdlc committed with pixeltrix Jan 25, 2013
Commits on Feb 16, 2013
  1. Merge pull request #9308 from joernchen/patch-1

    Update activemodel/CHANGELOG.md
    fxn committed Feb 16, 2013
  2. Update activemodel/CHANGELOG.md

    Fixed a typo
    joernchen committed Feb 16, 2013
Commits on Feb 15, 2013
  1. Revert "Merge pull request #9252 from senny/8423_hmt_preloading_bug"

    This reverts commit c545177.
    
    Conflicts:
    	activerecord/CHANGELOG.md
    rafaelfranca committed Feb 15, 2013
Commits on Feb 14, 2013
  1. 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
    rafaelfranca committed Feb 14, 2013
  2. Merge pull request #9289 from rails/3-2-stable-test-with-ruby-2

    Add Ruby 2.0 RC to Travis CI build matrix
    rafaelfranca committed Feb 14, 2013
  3. Fix typo in railties changelog [ci skip]

    Other changelogs were fixed in f15581b.
    carlosantoniodasilva committed Feb 14, 2013
  4. Merge pull request #9288 from jmccartie/jm/typos

    Fixed changelog typos [ci skip]
    rafaelfranca committed Feb 14, 2013
  5. Merge pull request #9278 from matthewrobertson/backport-hmt-counter-c…

    …ache-bug
    
    Backport of #8400 to fix for issue #7630, a bug in has_many :through counter caches.
    carlosantoniodasilva committed Feb 14, 2013
Commits on Feb 12, 2013
Commits on Feb 11, 2013
  1. Merge branch '3-2-sec' into 3-2-stable

    * 3-2-sec:
      bumping version
      remove ruby-prof
      Fix issue with attr_protected where malformed input could circumvent protection
      fixing call to columns hash. run the damn tests when you backport!
      Bump rack dependency to 1.4.5
      Merge pull request #9224 from dylanahsmith/bigdecimal-takes-string
      Merge pull request #9208 from dylanahsmith/3-2-mysql-quote-numeric
    
    Conflicts:
    	Gemfile
    	activerecord/CHANGELOG.md
    tenderlove committed Feb 11, 2013
  2. bumping version

    tenderlove committed Feb 11, 2013
  3. remove ruby-prof

    tenderlove committed Feb 11, 2013
Commits on Feb 10, 2013
  1. Merge pull request #9239 from senny/use_ruby_version_on_3_2

    ignore .ruby-version instead of tool specifc config on 3-2-stable
    guilleiguaran committed Feb 10, 2013
  2. Fix issue with attr_protected where malformed input could circumvent

    protection
    
    Fixes: CVE-2013-0276
    joernchen committed with tenderlove Feb 9, 2013