Permalink
Commits on Oct 15, 2012
Commits on Oct 14, 2012
  1. Merge pull request #7940 from arturopie/7914-backport-to-3-2-stable

    rafaelfranca committed Oct 14, 2012
    Backport fix of issue #7914 to 3-2-stable
  2. 7914 Using a better way to get the defaults from db.

    arturopie committed Oct 14, 2012
    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.
  3. #7914 get default value when type uses schema name

    arturopie committed Oct 14, 2012
    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. Merge pull request #7925 from ernie/3-2-fix-collection-associations-w…

    rafaelfranca committed Oct 12, 2012
    …ith-select
    
    Fix has_many assocation w/select load after create
  2. Fix has_many assocation w/select load after create

    ernie committed Oct 5, 2012
    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 11, 2012
  1. Merge pull request #7905 from jfirebaugh/eager_autoload_3-2

    rafaelfranca committed Oct 11, 2012
    Backport eager autoloading fixes
Commits on Oct 10, 2012
  1. Eager autoload Preloader classes

    jfirebaugh committed Oct 10, 2012
    Without eager autoloading, these would be autoloaded
    only when #preloader_for is called, which is too late
    in threaded applications.
Commits on Oct 7, 2012
  1. Backport 1a70499

    jeremy committed Oct 7, 2012
    Tag the blank log line between dev requests so it's easier to filter out entire requests with grep -v without leaving a stray newline behind. Example:
    
      # Tag asset requests so it's easy to filter them from dev logs
      config.log_tags = [
        -> request { :assets if request.path.starts_with?(config.assets.prefix) },
        -> request { request.uuid }
      ]
    
      # Watch the logs, ignoring asset requests
      $ tail -100f log/development.log | grep -v assets
  2. Merge pull request #7865 from teleological/link_to_remote_3_2

    rafaelfranca committed Oct 7, 2012
    Accept :remote as symbol in link_to options (backport)
Commits on Oct 6, 2012
  1. Accept :remote as symbol in link_to options

    teleological committed Oct 6, 2012
    Accept either :remote or 'remote' in both the html_options and
    (url_)options hash arguments to link_to.
  2. Merge pull request #7848 from senny/3415_assert_template_has_nil_vari…

    rafaelfranca committed Oct 6, 2012
    …able
    
    can't pass :locals to #assert_template without a view test case (#3415)
    Conflicts:
    	actionpack/CHANGELOG.md
  3. Merge pull request #7850 from senny/5920_postgres_adapter_table_with_…

    rafaelfranca committed Oct 6, 2012
    …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. Merge pull request #6978 from frodsan/count_nosql_unsaved_parent

    rafaelfranca committed Oct 4, 2012
    Count returns 0 without querying if parent is not saved
Commits on Oct 3, 2012
  1. Merge pull request #7836 from lihanli/error-msg-update

    rafaelfranca committed Oct 3, 2012
    Update supported ruby versions error message in ruby_version_check.rb
  2. Refactor

    spastorino committed with rafaelfranca Oct 3, 2012
    Conflicts:
    	activerecord/lib/active_record/counter_cache.rb
Commits on Oct 2, 2012
  1. Merge pull request #7822 from lulalala/reset-counter-cache-for-has-ma…

    rafaelfranca committed Oct 2, 2012
    …ny-through
    
    Fix reset_counters crashing on has_many :through associations.
    Conflicts:
    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/counter_cache.rb
  2. Merge pull request #7797 from senny/7459_prefix_tempalte_assertion_va…

    rafaelfranca committed Oct 2, 2012
    …riables
    
    prefix TemplateAssertions ivars.
    
    Closes #7459
    Conflicts:
    	actionpack/lib/action_controller/test_case.rb
    	actionpack/lib/action_view/test_case.rb
Commits on Oct 1, 2012
  1. Merge pull request #7789 from senny/7777_resource_functions_modify_op…

    rafaelfranca committed Oct 1, 2012
    …tions
    
    resource and resources do no longer modify passed options
  2. Merge pull request #6450 from iHiD/resource_generator_routes_master

    rafaelfranca committed Oct 1, 2012
    Master branch: Fixed generated whitespace in routes when using namespaced resource.
    
    Merge pull request #7811 from iHiD/resource_generator_routes_master
    
    Fix the build (Broken scaffold routes test)
Commits on Sep 30, 2012
  1. Asset manifest includes aliases for foo.js -> foo/index.js and vice v…

    jeremy committed Sep 30, 2012
    …ersa. Bump Sprockets requirements from 2.1+ to 2.2+ and let it answer "should we compile this asset?" for us.
  2. Merge pull request #7802 from steveklabnik/issue_7799

    fxn committed Sep 30, 2012
    Fix reference to code sample in Getting Started.
  3. Merge pull request #7659 from HugoLnx/template_error_no_matches_rebased

    rafaelfranca committed Sep 30, 2012
    REBASED: fixing assert_template bug when template matches expected, but not ends with
    Conflicts:
    	actionpack/CHANGELOG.md
    	actionpack/lib/action_controller/test_case.rb
Commits on Sep 29, 2012
  1. Merge pull request #7786 from yabawock/3-2-stable

    rafaelfranca committed Sep 29, 2012
    Backport "Don't paramify ActionDispatch::Http::UploadedFile in tests"
  2. Don't paramify ActionDispatch::Http::UploadedFile in tests

    Tim Vandecasteele committed with mjonuschat Jun 21, 2012
    To test uploading a file without using fixture_file_upload, a posted
    ActionDispatch::Http::UploadedFile should not be paramified (just like
    Rack::Test::UploadedFile).
    (Rack::Test::UploadedFile and ActionDispatch::Http::UploadedFile don't
    share the same API, tempfile is not accessible on
    Rack::Test::UploadedFile as discussed in
    rack-test/rack-test#30)
Commits on Sep 28, 2012
  1. backport 68677ff

    Evan Petrie committed Sep 28, 2012
  2. Hashrocket for 1.8 support

    jeremy committed Sep 28, 2012