Skip to content
Commits on Oct 30, 2012
  1. @rafaelfranca

    Add CHANGELOG entry to #8032 fix

    e6b4184 fixes that issue too.
    
    [ci skip]
    rafaelfranca committed Oct 29, 2012
  2. @rafaelfranca

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

    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.
    rafaelfranca committed Oct 29, 2012
Commits on Oct 29, 2012
  1. @graceliu @rafaelfranca

    fixed support for DATABASE_URL for rake db tasks

    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.
    graceliu committed with rafaelfranca Oct 12, 2012
  2. @carlosantoniodasilva @rafaelfranca

    Merge pull request #8053 from henrik/update_columns_with_primary_key

    Unbreak update_column/update_columns for the primary key attribute.
    Conflicts:
    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/persistence.rb
    	activerecord/test/cases/persistence_test.rb
    carlosantoniodasilva committed with rafaelfranca Oct 28, 2012
  3. @rafaelfranca

    Merge pull request #7593 from veader/patch-1

    Decode attributes pulled from URI.parse
    Conflicts:
    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/connection_adapters/connection_specification.rb
    rafaelfranca committed Oct 26, 2012
Commits on Oct 18, 2012
  1. @spastorino @rafaelfranca

    Merge pull request #7371 from csmuc/fix_dup_validation_errors

    Dup'ed ActiveRecord objects may not share the errors object
    Conflicts:
    	activerecord/CHANGELOG.md
    	activerecord/test/cases/dup_test.rb
    spastorino committed with rafaelfranca Oct 16, 2012
Commits on Oct 15, 2012
  1. @tenderlove
Commits on Oct 14, 2012
  1. @arturopie

    #7914 get default value when type uses schema name

    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
    defaults.
    
    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.
    arturopie committed Oct 13, 2012
Commits on Oct 12, 2012
  1. @ernie

    Fix has_many assocation w/select load after create

    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
    not.
    ernie committed Oct 5, 2012
Commits on Oct 6, 2012
  1. @rafaelfranca

    Merge pull request #7850 from senny/5920_postgres_adapter_table_with_…

    …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
    rafaelfranca committed Oct 5, 2012
Commits on Oct 4, 2012
  1. @rafaelfranca

    Merge pull request #6978 from frodsan/count_nosql_unsaved_parent

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

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

    …ny-through
    
    Fix reset_counters crashing on has_many :through associations.
    Conflicts:
    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/counter_cache.rb
    rafaelfranca committed Oct 2, 2012
Commits on Sep 24, 2012
  1. @jrochkind

    ConnectionPool accepts spec key 'checkout_timeout'

    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'.
    jrochkind committed Sep 21, 2012
Commits on Sep 21, 2012
  1. @tenderlove @steveklabnik

    Merge pull request #3544 from amatsuda/_field_changed

    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
    tenderlove committed with steveklabnik Feb 14, 2012
Commits on Sep 20, 2012
  1. @rafaelfranca

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

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

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

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

    Backport explain fixes.

    * Mark as SCHEMA some schema database queries. #7648
    * Don't explain queries except normal CRUD sql. #7657
    
    Closes #6458
    Closes #7544
    rafaelfranca committed Sep 16, 2012
Commits on Sep 13, 2012
  1. fix markdown markup in AR/CHANGELOG

    Francesco Rodríguez committed Sep 13, 2012
  2. Backport PostgreSQL auto-reconnect test coverage

    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.
    Steve Jorgensen committed Jun 6, 2012
Commits on Sep 11, 2012
  1. @kennyj

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

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

    Merge pull request #7582 from tchandy/fix_type_cast_code

    type_cast_code should always convert values to integer calling #to_i
    rafaelfranca committed Sep 9, 2012
  2. @thiagopradi

    ConnectionAdapters::Column.type_cast_code should always convert value…

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

    Merge pull request #7337 from adzap/string_to_dummy_time

    Fix for time type columns with invalid time value
    Conflicts:
    	activerecord/CHANGELOG.md
    rafaelfranca committed Sep 5, 2012
Commits on Sep 3, 2012
  1. @senny

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

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

    CHANGELOGs are now per branch

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

    Merge pull request #5210 from Pliny/masteri

    Fix for #5200
    
    Conflicts:
    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/counter_cache.rb
    rafaelfranca committed Aug 21, 2012
  2. @rafaelfranca

    Merge pull request #6986 from kennyj/fix_6975

    Fix #6975. Round usec when writing timestamp attribute.
    
    Conflicts:
    	activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
    rafaelfranca committed Aug 21, 2012
  3. @carlosantoniodasilva

    Merge pull request #7377 from brainopia/use_inversed_parent_for_first…

    …_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
    carlosantoniodasilva committed Aug 18, 2012
Commits on Aug 17, 2012
  1. @rafaelfranca

    Merge pull request #7352 from aripollak/microsecond-timestamp

    Fix occasional microsecond conversion inaccuracy
    Conflicts:
    	activerecord/CHANGELOG.md
    rafaelfranca committed Aug 17, 2012
Commits on Aug 15, 2012
  1. @carlosantoniodasilva
  2. @rafaelfranca

    Do not use update_column where update_attribute is not interchangeable

    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
    rafaelfranca committed Aug 15, 2012
Commits on Aug 12, 2012
  1. @rafaelfranca

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

    Restore state on create when ActiveRecord::RecordInvalid is raised
    Conflicts:
    	activerecord/CHANGELOG.md
    rafaelfranca committed Aug 11, 2012
Commits on Aug 10, 2012
  1. @rafaelfranca

    Add CHANGELOG entry for #7286

    rafaelfranca committed Aug 10, 2012
Commits on Aug 9, 2012
  1. @spastorino
Something went wrong with that request. Please try again.