Skip to content


Subversion checkout URL

You can clone with
Download ZIP
Commits on Jan 8, 2013
  1. @tenderlove

    * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] …

    tenderlove committed
    …* dealing with empty hashes. Thanks Damien Mathieu
Commits on Dec 23, 2012
  1. @tenderlove

    updating changelog

    tenderlove committed
  2. @tenderlove
  3. @claudiob @tenderlove

    Add release date of Rails 3.2.9 to documentation

    claudiob committed with tenderlove
Commits on Nov 1, 2012
  1. @carlosantoniodasilva

    Fix issue with collection associations and first(n)/last(n)

    carlosantoniodasilva committed
    When calling first(n) or last(n) in a collection, Active Record was
    improperly trying to set the inverse of instance in case that option
    existed. This change was introduced by
    In such cases we don't need to do that "manually", since the way
    collection will be loaded will already handle that, so we just skip
    setting the inverse association when any argument is given to
    The test included ensures that these scenarios will have the inverse of
    instance set properly.
    Fixes #8087, Closes #8094.
Commits on Oct 30, 2012
  1. @rafaelfranca

    Add CHANGELOG entry to #8032 fix

    rafaelfranca committed
    e6b4184 fixes that issue too.
    [ci skip]
  2. @rafaelfranca

    Fix bug when Column is trying to type cast boolean values to integer.

    rafaelfranca committed
    This can occur if the user is using :integer columns to store boolean
    values. Now we are handling the boolean values but it still raises if
    the value can't type cast to integer and is not a boolean. See #7509.
    Fixes #8067.
Commits on Oct 29, 2012
  1. @graceliu @rafaelfranca

    fixed support for DATABASE_URL for rake db tasks

    graceliu committed with rafaelfranca
    Backport for #7521
    - added tests to confirm establish_connection uses DATABASE_URL and
      Rails.env correctly even when no arguments are passed in.
    - updated rake db tasks to support DATABASE_URL, and added tests to
      confirm correct behavior for these rake tasks.  (Removed
      establish_connection call from some tasks since in those cases
      the :environment task already made sure the function would be called)
    - updated Resolver so that when it resolves the database url, it
      removes hash values with empty strings from the config spec (e.g.
      to support connection to postgresql when no username is specified).
    - updated ResolverTest to use current_adapter? to check the type of
      the current adapter.
  2. @carlosantoniodasilva @rafaelfranca

    Merge pull request #8053 from henrik/update_columns_with_primary_key

    carlosantoniodasilva committed with rafaelfranca
    Unbreak update_column/update_columns for the primary key attribute.
  3. @rafaelfranca

    Merge pull request #7593 from veader/patch-1

    rafaelfranca committed
    Decode attributes pulled from URI.parse
Commits on Oct 18, 2012
  1. @spastorino @rafaelfranca

    Merge pull request #7371 from csmuc/fix_dup_validation_errors

    spastorino committed with rafaelfranca
    Dup'ed ActiveRecord objects may not share the errors object
Commits on Oct 15, 2012
  1. @tenderlove
Commits on Oct 14, 2012
  1. @arturopie

    #7914 get default value when type uses schema name

    arturopie committed
    PostgreSQL adapter properly parses default values when using multiple
    schemas and domains.
    When using domains across schemas, PostgresSQL prefixes the type of the
    default value with the name of the schema where that type (or domain) is.
    For example, this query:
    SELECT a.attname, d.adsrc
    FROM pg_attribute a LEFT JOIN pg_attrdef d
    ON a.attrelid = d.adrelid AND a.attnum = d.adnum
    WHERE a.attrelid = "defaults"'::regclass
    AND a.attnum > 0 AND NOT a.attisdropped
    ORDER BY a.attnum;
    could return something like "'<default_value>'::pg_catalog.text" or
    "(''<default_value>'::pg_catalog.text)::text" for the text columns with
    I modified the regexp used to parse this value so that it ignores
    anything between ':: and \b(?:character varying|bpchar|text), and it
    allows to have optional parens like in the above second example.
Commits on Oct 12, 2012
  1. @ernie

    Fix has_many assocation w/select load after create

    ernie committed
    If you create a new record via a collection association proxy that has
    not loaded its target, and which selects additional attributes through
    the association, then when the proxy loads its target, it will
    inadvertently trigger a deprecation notice during attribute writing when
    CollectionAssociation#merge_target_lists attempts to do its thing, since
    the newly loaded records will possess attributes the created record does
Commits on Oct 6, 2012
  1. @rafaelfranca

    Merge pull request #7850 from senny/5920_postgres_adapter_table_with_…

    rafaelfranca committed
    postgres, quote table names when fetching the primary key (#5920)
Commits on Oct 4, 2012
  1. @rafaelfranca

    Merge pull request #6978 from frodsan/count_nosql_unsaved_parent

    rafaelfranca committed
    Count returns 0 without querying if parent is not saved
Commits on Oct 2, 2012
  1. @rafaelfranca

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

    rafaelfranca committed
    Fix reset_counters crashing on has_many :through associations.
Commits on Sep 24, 2012
  1. @jrochkind

    ConnectionPool accepts spec key 'checkout_timeout'

    jrochkind committed
    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. @tenderlove @steveklabnik

    Merge pull request #3544 from amatsuda/_field_changed

    tenderlove committed with steveklabnik
    Rename field_changed? to _field_changed? so that users can create a field named field
Commits on Sep 20, 2012
  1. @rafaelfranca

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

    rafaelfranca committed
    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.
    Related with #7675
Commits on Sep 17, 2012
  1. @jrochkind
  2. @rafaelfranca

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

    rafaelfranca committed
    Fix collection= on hm:t join models when unsaved
  3. @rafaelfranca

    Backport explain fixes.

    rafaelfranca committed
    * 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. fix markdown markup in AR/CHANGELOG

    Francesco Rodríguez committed
  2. Backport PostgreSQL auto-reconnect test coverage

    Steve Jorgensen committed
    Simulated & actual (manual/skipped) PostgreSQL auto-reconnection tests.
    Stop being silly with formatting of method aliasing.
    Fix just-plain-wrongness of psql auto-reconnect test.
    Fix only-once stub logic.
    Changelog for PostgreSQL auto-reconnect test coverage backport.
Commits on Sep 11, 2012
  1. @kennyj

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

    kennyj committed
    …ase configuration use not charset but encoding.
Commits on Sep 9, 2012
  1. @rafaelfranca

    Merge pull request #7582 from tchandy/fix_type_cast_code

    rafaelfranca committed
    type_cast_code should always convert values to integer calling #to_i
  2. @tchandy

    ConnectionAdapters::Column.type_cast_code should always convert value…

    tchandy committed
    …s to integer calling #to_i
Commits on Sep 5, 2012
  1. @rafaelfranca

    Merge pull request #7337 from adzap/string_to_dummy_time

    rafaelfranca committed
    Fix for time type columns with invalid time value
Commits on Sep 3, 2012
  1. @senny

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

    senny committed with senny
    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:
    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'
Commits on Aug 28, 2012
  1. @fxn

    CHANGELOGs are now per branch

    fxn committed
    Check 810a50d for the rationale.
Commits on Aug 21, 2012
  1. @rafaelfranca

    Merge pull request #5210 from Pliny/masteri

    rafaelfranca committed
    Fix for #5200
  2. @rafaelfranca

    Merge pull request #6986 from kennyj/fix_6975

    rafaelfranca committed
    Fix #6975. Round usec when writing timestamp attribute.
  3. @carlosantoniodasilva

    Merge pull request #7377 from brainopia/use_inversed_parent_for_first…

    carlosantoniodasilva committed
    Use inversed parent for first and last child of has_many association
    [Backport] Closes #3223.
Commits on Aug 17, 2012
  1. @rafaelfranca

    Merge pull request #7352 from aripollak/microsecond-timestamp

    rafaelfranca committed
    Fix occasional microsecond conversion inaccuracy
Something went wrong with that request. Please try again.