Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Oct 6, 2012
  1. Rafael Mendonça França

    Merge pull request #7850 from senny/5920_postgres_adapter_table_with_…

    rafaelfranca authored
    …capital_letters
    
    postgres, quote table names when fetching the primary key (#5920)
    Conflicts:
    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
Commits on Oct 4, 2012
  1. Rafael Mendonça França

    Merge pull request #6978 from frodsan/count_nosql_unsaved_parent

    rafaelfranca authored
    Count returns 0 without querying if parent is not saved
Commits on Oct 2, 2012
  1. Rafael Mendonça França

    Merge pull request #7822 from lulalala/reset-counter-cache-for-has-ma…

    rafaelfranca authored
    …ny-through
    
    Fix reset_counters crashing on has_many :through associations.
    Conflicts:
    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/counter_cache.rb
Commits on Sep 24, 2012
  1. Jonathan Rochkind

    ConnectionPool accepts spec key 'checkout_timeout'

    jrochkind authored
    Backport of #6441 cb6f839 . Old 'wait_timeout' is still supported,
    but conflicts with mysql2 using that spec key for different thing.
    'checkout_timeout' can now be used taking precedence for ConnectionPool
    over 'wait_timeout'.
Commits on Sep 21, 2012
  1. Aaron Patterson Steve Klabnik

    Merge pull request #3544 from amatsuda/_field_changed

    tenderlove authored steveklabnik committed
    Rename field_changed? to _field_changed? so that users can create a field named field
    Conflicts:
    
    	activerecord/lib/active_record/core.rb
    	activerecord/test/cases/dirty_test.rb
Commits on Sep 20, 2012
  1. Rafael Mendonça França

    Revert "backport fair connection pool 02b2335 to 3-2-stable"

    rafaelfranca authored
    This reverts commit 0693e07.
    
    Revert "Cache columns metadata to avoid extra while testing"
    
    This reverts commit a82f1e3.
    
    Reason: This is causing failures in the postgresql build.
    See http://travis-ci.org/#!/rails/rails/builds/2485584
    
    Related with #7675
Commits on Sep 17, 2012
  1. Jonathan Rochkind
  2. Rafael Mendonça França

    Merge pull request #7661 from ernie/build-join-records-on-unsaved-hmt

    rafaelfranca authored
    Fix collection= on hm:t join models when unsaved
  3. Rafael Mendonça França

    Backport explain fixes.

    rafaelfranca authored
    * Mark as SCHEMA some schema database queries. #7648
    * Don't explain queries except normal CRUD sql. #7657
    
    Closes #6458
    Closes #7544
Commits on Sep 13, 2012
  1. Francesco Rodríguez
  2. Backport PostgreSQL auto-reconnect test coverage

    Steve Jorgensen authored
    6d5f4de
    Simulated & actual (manual/skipped) PostgreSQL auto-reconnection tests.
    
    4b1bca0
    Stop being silly with formatting of method aliasing.
    
    c381d5c
    Fix just-plain-wrongness of psql auto-reconnect test.
    
    1e17a9d
    Fix only-once stub logic.
    
    f16c2043826ec1991cf94fe17cb671507b7a7f51
    Changelog for PostgreSQL auto-reconnect test coverage backport.
Commits on Sep 11, 2012
  1. Toshinori Kajihara

    Backported #7572 to 3-2-stable. Use config['encoding'], because datab…

    kennyj authored
    …ase configuration use not charset but encoding.
Commits on Sep 9, 2012
  1. Rafael Mendonça França

    Merge pull request #7582 from tchandy/fix_type_cast_code

    rafaelfranca authored
    type_cast_code should always convert values to integer calling #to_i
  2. Thiago Pradi

    ConnectionAdapters::Column.type_cast_code should always convert value…

    tchandy authored
    …s to integer calling #to_i
Commits on Sep 5, 2012
  1. Rafael Mendonça França

    Merge pull request #7337 from adzap/string_to_dummy_time

    rafaelfranca authored
    Fix for time type columns with invalid time value
    Conflicts:
    	activerecord/CHANGELOG.md
Commits on Sep 3, 2012
  1. Yves Senn

    set the configured #inheritance_column on #become (#7503)

    senny authored senny committed
    I had to create a new table because I needed an STI table,
    which does not have both a "type" and a "custom_type"
    
    the test fails with:
      1) Error:
    test_alt_becomes_works_with_sti(InheritanceTest):
    NoMethodError: undefined method `type=' for #<Cabbage id: 1, name: "my cucumber", custom_type: "Cucumber">
        /Users/username/Projects/rails/activemodel/lib/active_model/attribute_methods.rb:432:in `method_missing'
        /Users/username/Projects/rails/activerecord/lib/active_record/attribute_methods.rb:100:in `method_missing'
        /Users/username/Projects/rails/activerecord/lib/active_record/persistence.rb:165:in `becomes'
        test/cases/inheritance_test.rb:134:in `test_becomes_works_with_sti'
        test/cases/inheritance_test.rb:140:in `test_alt_becomes_works_with_sti'
    
    Conflicts:
    
    	activerecord/test/cases/inheritance_test.rb
Commits on Aug 28, 2012
  1. Xavier Noria

    CHANGELOGs are now per branch

    fxn authored
    Check 810a50d for the rationale.
Commits on Aug 21, 2012
  1. Rafael Mendonça França

    Merge pull request #5210 from Pliny/masteri

    rafaelfranca authored
    Fix for #5200
    
    Conflicts:
    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/counter_cache.rb
  2. Rafael Mendonça França

    Merge pull request #6986 from kennyj/fix_6975

    rafaelfranca authored
    Fix #6975. Round usec when writing timestamp attribute.
    
    Conflicts:
    	activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
  3. Carlos Antonio da Silva

    Merge pull request #7377 from brainopia/use_inversed_parent_for_first…

    carlosantoniodasilva authored
    …_and_last_child
    
    Use inversed parent for first and last child of has_many association
    
    [Backport] Closes #3223.
    
    Conflicts:
    	activerecord/lib/active_record/associations/collection_association.rb
Commits on Aug 17, 2012
  1. Rafael Mendonça França

    Merge pull request #7352 from aripollak/microsecond-timestamp

    rafaelfranca authored
    Fix occasional microsecond conversion inaccuracy
    Conflicts:
    	activerecord/CHANGELOG.md
Commits on Aug 15, 2012
  1. Carlos Antonio da Silva
  2. Rafael Mendonça França

    Do not use update_column where update_attribute is not interchangeable

    rafaelfranca authored
    Revert "Deprecate update_attribute."
    
    This reverts commit b081f6b.
    
    Reason: Since the new deprecation policy we removed the deprecation of
    update_attribute but we didn't reverted the changes to use
    update_column.
    
    Fixes #7306
Commits on Aug 12, 2012
  1. Rafael Mendonça França

    Merge pull request #6073 from daveyeu/restore-state-on-record-invalid

    rafaelfranca authored
    Restore state on create when ActiveRecord::RecordInvalid is raised
    Conflicts:
    	activerecord/CHANGELOG.md
Commits on Aug 10, 2012
  1. Rafael Mendonça França
Commits on Aug 9, 2012
  1. Santiago Pastorino
  2. Santiago Pastorino
  3. Rafael Mendonça França

    Add CHANGELOG entry

    rafaelfranca authored
Commits on Aug 6, 2012
  1. Rafael Mendonça França
Commits on Aug 5, 2012
  1. Rafael Mendonça França

    Merge pull request #7140 from seamusabshere/patch-1

    rafaelfranca authored
    Make sure :environment task is executed before db:schema:load or
    db:structure:load
    
    Conflicts:
    	activerecord/CHANGELOG.md
Commits on Aug 2, 2012
  1. Rafael Mendonça França Santiago Pastorino

    Do not consider the numeric attribute as changed if the old value is

    rafaelfranca authored spastorino committed
    zero and the new value is not a string.
    
    Before this commit this was the behavior
    
    r = Review.find_by_issue(0)
    r.issue
    => 0
    r.changes
    => {}
    r.issue = 0
    => 0
    r.changed?
    => true
    r.changes
    => {"issue"=>[0,0]}
    
    Fixes #7237
  2. Rafael Mendonça França

    Do not consider the numeric attribute as changed if the old value is

    rafaelfranca authored
    zero and the new value is not a string.
    
    Before this commit this was the behavior
    
    r = Review.find_by_issue(0)
    r.issue
    => 0
    r.changes
    => {}
    r.issue = 0
    => 0
    r.changed?
    => true
    r.changes
    => {"issue"=>[0,0]}
    
    Fixes #7237
Commits on Aug 1, 2012
  1. Santiago Pastorino

    This entry is wrong

    spastorino authored
  2. Rafael Mendonça França

    Fix CHANGELOGS

    rafaelfranca authored
  3. Xavier Noria

    removes the deprecation of update_attribute

    fxn authored
    Applying the new policy here to not deprecate stuff in point releases.
Something went wrong with that request. Please try again.