Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Oct 22, 2012
  1. @tenderlove
Commits on Oct 18, 2012
  1. @Grandrath

    Use `Rails.env` instead of `ENV['RAILS_ENV']`; #7951

    Grandrath authored
    `ENV['RAILS_ENV']` is not defined unless explicitly specified on the
    command line when running `rake db:structure:load`. This patch lets
    the rake task retrieve the environment from `Rails.env` which defaults
    to "development".
  2. @spastorino @rafaelfranca

    Merge pull request #7371 from csmuc/fix_dup_validation_errors

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

    7914 Using a better way to get the defaults from db.

    arturopie authored
    Changes:
    
    * According to postgreSQL documentation:
    (http://www.postgresql.org/docs/8.2/static/catalog-pg-attrdef.html)
    we should not be using 'adsrc' field because this field is unaware of
    outside changes that could affect the way that default values are
    represented. Thus, I changed the queries to use
    "pg_get_expr(adbin, adrelid)" instead of the historical "adsrc" field.
    
    * Remove parsing of character type default values for 8.1 formatting since
    Rails doesn't support postgreSQL 8.1 anymore.
    
    * Remove misleading comment unrelated to code.
  2. @arturopie

    #7914 get default value when type uses schema name

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

    Fix has_many assocation w/select load after create

    ernie authored
    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.
Commits on Oct 10, 2012
  1. @jfirebaugh

    Eager autoload Preloader classes

    jfirebaugh authored
    Without eager autoloading, these would be autoloaded
    only when #preloader_for is called, which is too late
    in threaded applications.
  2. @michaelfairley @jfirebaugh

    Eager autoload ActiveRecord association helpers

    michaelfairley authored jfirebaugh committed
Commits on Oct 6, 2012
  1. @rafaelfranca

    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. @rafaelfranca

    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 3, 2012
  1. @spastorino @rafaelfranca

    Refactor

    spastorino authored rafaelfranca committed
    Conflicts:
    	activerecord/lib/active_record/counter_cache.rb
Commits on Oct 2, 2012
  1. @rafaelfranca

    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 28, 2012
  1. backport 68677ff

    Evan Petrie authored
Commits on Sep 24, 2012
  1. @jrochkind

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

    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. @rafaelfranca

    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
  2. @jeremy @rafaelfranca

    Load the environment after creating the database

    jeremy authored rafaelfranca committed
    Conflicts:
    	activerecord/lib/active_record/railties/databases.rake
Commits on Sep 17, 2012
  1. @jrochkind
  2. @rafaelfranca

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

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

    Merge pull request #7651 from steveklabnik/issue_3956

    rafaelfranca authored
    Don't preserve SELECT columns on COUNT
    
    Closes #7651
    
    Conflicts:
    	activerecord/test/cases/associations/has_many_associations_test.rb
  4. @rafaelfranca

    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. 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. @kennyj

    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. @rafaelfranca

    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. @tchandy

    ConnectionAdapters::Column.type_cast_code should always convert value…

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

    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. @senny

    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 30, 2012
  1. @fxn

    documents after_(commit|rollback)

    fxn authored
Commits on Aug 28, 2012
  1. @lifo

    Ensure association preloading properly merges default scope and assoc…

    lifo authored
    …iation conditions
    
    Conflicts:
    
    	activerecord/test/models/reader.rb
Commits on Aug 21, 2012
  1. @rafaelfranca

    Merge pull request #5210 from Pliny/masteri

    rafaelfranca authored
    Fix for #5200
    
    Conflicts:
    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/counter_cache.rb
  2. @rafaelfranca

    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. @carlosantoniodasilva

    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 18, 2012
  1. @rafaelfranca

    Merge pull request #7388 from ManageIQ/fix_table_remove_passing_array…

    rafaelfranca authored
    …_deprecation
    
    Table#remove passed an array to remove_column, which is deprecated.
  2. @jrafanie
Something went wrong with that request. Please try again.