Permalink
Commits on Jul 26, 2012
  1. updating release date

    tenderlove committed Jul 26, 2012
  2. bumping to 3.2.7

    tenderlove committed Jul 26, 2012
  3. updating the changelog

    tenderlove committed Jul 26, 2012
Commits on Jul 23, 2012
  1. updating the version

    tenderlove committed Jul 23, 2012
  2. updating changelogs

    tenderlove committed Jul 23, 2012
  3. Bump Journey requirements to 1.0.4

    There are some Action Pack tests for regressions from 3.1 that require
    a later version of Journey to pass so bump to the current version.
    pixeltrix committed Jul 23, 2012
Commits on Jul 21, 2012
Commits on Jul 20, 2012
  1. `validates_inclusion_of` and `validates_exclusion_of` now accept

    `:within` option as alias of `:in` as documented.
    
    Fix #7118
    rafaelfranca committed Jul 20, 2012
  2. Merge pull request #6616 from dpassage/fix_resolver_test_sqlite3

    Resolver tests fail if mysql adapter not installed
    carlosantoniodasilva committed Jun 5, 2012
Commits on Jul 19, 2012
  1. Merge pull request #7108 from arunagw/mocha_bump

    Bumping mocha!
    rafaelfranca committed Jul 19, 2012
  2. Bumping mocha!

    Reason:- 0.12.0 introduced a bug where you got a exception
    which is now in 0.12.1 is a warning only!
    arunagw committed Jul 19, 2012
Commits on Jul 17, 2012
  1. Merge pull request #7080 from jfirebaugh/to_param_regression

    AR::Integration must be included after AM::Conversion
    jonleighton committed Jul 17, 2012
  2. AR::Integration must be included after AM::Conversion

    Integration's definition of #to_param must override
    Conversion's. Otherwise, there is a regression from
    3.1 in the behavior of a non-persisted AR::Base instance
    which nevertheless has an id.
    jfirebaugh committed Jul 17, 2012
  3. Add support for optional root segments containing slashes

    Optional segments with a root scope need to have the leading slash
    outside of the parentheses, otherwise the generated url will be empty.
    However if the route has non-optional elements then the leading slash
    needs to remain inside the parentheses otherwise the generated url
    will have two leading slashes, e.g:
    
    Blog::Application.routes.draw do
      get '/(:category)', :to => 'posts#index', :as => :root
      get '/(:category)/author/:name', :to => 'posts#author', :as => :author
    end
    
    $ rake routes
      root GET /(:category)(.:format)              posts#index
    author GET (/:category)/author/:name(.:format) posts#author
    
    This change adds support for optional segments that contain a slash,
    allowing support for urls like /page/2 for the root path, e.g:
    
    Blog::Application.routes.draw do
      get '/(page/:page)', :to => 'posts#index', :as => :root
    end
    
    $ rake routes
    root GET /(page/:page)(.:format) posts#index
    
    Fixes #7073
    (cherry picked from commit d8745de)
    pixeltrix committed Jul 17, 2012
  4. Merge pull request #4396 from kennyj/fix_4259

    Fix GH #4259. When we execute schema dumper, we must remove table_name_prefix and table_name_suffix.
    rafaelfranca committed Jun 20, 2012
Commits on Jul 14, 2012
  1. adds a missing require [fixes #6896]

    This file uses Time.zone, which is defined in
    active_support/core_ext/time/zones.rb.
    fxn committed Jul 14, 2012
Commits on Jul 13, 2012
  1. fixing tests to deal with data differences between prepared statement…

    …s and non-prepared statements
    tenderlove committed Jul 13, 2012
  2. Only use prepared statements when bind variables are present

    Prepared statements (prepare/execute/close) were being used unnecessarily
    when no bind variables were present, and disabling prepared statement using
    prepared_statements:false was principally broken. While bind variables were
    correctly substituted with prepared_statements:false, the prepared statement
    interface was still used, costing an extra two round trips per query.
    
    In addition to making this behavioral change, I also cleaned up the internals
    of exec_stmt and exec_without_stmt so that they behave the same (calling log
    and constructing the ActiveRecord::Result in the same way).
    
    Moving the check for binds.empty? to exec_query also will mean that several
    code paths explicitly calling exec_without_stmt could be cleaned up to once
    again call exec_query instead. I have also left the check for binds.empty? in
    exec_stmt, since it is not a private method and could be called directly with
    an empty binds array. For the sake of clarity in this patch, I have not made
    those changes.
    
    = The previous behavior =
    
    When issuing a Foo.find(1) with prepared_statements:true, the bind variable
    is present in the prepared query, and execute shows a value passed:
    
        Connect	root@localhost on rails_test
        Query	SET SQL_AUTO_IS_NULL=0
        Statistics
        Query	SHOW FULL FIELDS FROM `foos`
        Query	SHOW TABLES LIKE 'foos'
        Query	SHOW CREATE TABLE `foos`
        Prepare	SELECT  `foos`.* FROM `foos`  WHERE `foos`.`id` = ? LIMIT 1
        Execute	SELECT  `foos`.* FROM `foos`  WHERE `foos`.`id` = 1 LIMIT 1
        Close stmt
        Quit
    
    When issuing a Foo.find(1) with prepared_statements:false, the bind variable
    has already been removed and substituted with the value, but the prepared
    statement interface is used anyway:
    
        Connect	root@localhost on rails_test
        Query	SET SQL_AUTO_IS_NULL=0
        Statistics
        Query	SHOW FULL FIELDS FROM `foos`
        Query	SHOW TABLES LIKE 'foos'
        Query	SHOW CREATE TABLE `foos`
        Prepare	SELECT  `foos`.* FROM `foos`  WHERE `foos`.`id` = 1 LIMIT 1
        Execute	SELECT  `foos`.* FROM `foos`  WHERE `foos`.`id` = 1 LIMIT 1
        Close stmt
        Quit
    
    = With this patch applied =
    
    When issuing a Foo.find(1) with prepared_statements:true, the bind variable
    is present in the prepared query, and execute shows a value passed:
    
        Connect	root@localhost on rails_test
        Query	SET SQL_AUTO_IS_NULL=0
        Statistics
        Query	SHOW FULL FIELDS FROM `foos`
        Query	SHOW TABLES LIKE 'foos'
        Query	SHOW CREATE TABLE `foos`
        Prepare	SELECT  `foos`.* FROM `foos`  WHERE `foos`.`id` = ? LIMIT 1
        Execute	SELECT  `foos`.* FROM `foos`  WHERE `foos`.`id` = 1 LIMIT 1
        Close stmt
        Quit
    
    When issuing a Foo.find(1) with prepared_statements:false, the bind variable
    has been removed and substituted with the value, and the query interface is
    used instead of the prepared statement interface:
    
        Connect	root@localhost on rails_test
        Query	SET SQL_AUTO_IS_NULL=0
        Statistics
        Query	SHOW FULL FIELDS FROM `foos`
        Query	SHOW TABLES LIKE 'foos'
        Query	SHOW CREATE TABLE `foos`
        Query	SELECT  `foos`.* FROM `foos`  WHERE `foos`.`id` = 1 LIMIT 1
        Quit
    jeremycole committed Jul 13, 2012
Commits on Jul 11, 2012
  1. Merge pull request #7031 from robbkidd/rename_sequences_too_backport_…

    …to_3-2
    
    Back-port #6874 to 3.2: psql adapter should rename a default pk sequence during rename_table
    drogus committed Jul 11, 2012
Commits on Jul 10, 2012
  1. Merge pull request #7025 from rustygeldmacher/select_options_valid_html

    Select options valid html
    rafaelfranca committed Jul 10, 2012
  2. Fixed bug creating invalid HTML in select options

    When a select tag is created for a field with errors, and that select
    tag has :prompt or :include_blank options, then the inserted first
    option will errantly have a <div class="field_with_errors"> wrapping
    it.
    
    See #7017
    Rusty Geldmacher committed Jul 10, 2012
Commits on Jul 9, 2012
  1. Merge pull request #7015 from sikachu/3-2-stable-code-style

    Update coding convention from master
    fxn committed Jul 9, 2012
Commits on Jul 6, 2012
  1. Merge pull request #6985 from sidonath/disable-query-cache-for-locks

    Disable query cache for lock queries
    Conflicts:
    	activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
    rafaelfranca committed Jul 6, 2012
Commits on Jul 5, 2012
  1. Merge pull request #6973 from route/wrapped_keys_in_log_for_3_2

    MIssed backport for 3.2
    rafaelfranca committed Jul 5, 2012
  2. Show in log correct wrapped keys

    route committed Apr 29, 2012
Commits on Jul 3, 2012
  1. Fix NumberHelper options wrapping to prevent verbatim blocks being re…

    …ndered instead of line continuations. While I'm at it, wrap long comment lines consistently.
    
    Conflicts:
    	actionpack/lib/action_view/helpers/number_helper.rb
    
    There was just one conflict related to the addition of the :format
    option to number_to_percentage.
    mjtko committed with carlosantoniodasilva May 8, 2012
Commits on Jul 2, 2012
  1. Merge pull request #6935 from frodsan/b1e509ad7a8c8264544f10f4666705c…

    …d806b5408
    
    Backport #3329 to 3-2-stable
    rafaelfranca committed Jul 2, 2012
  2. Backport #3329 to 3-2-stable

    Fix bug with autosave collection association on new record with a marked
    for destroy record in autosave collection.
    
    Fixes #6918.
    Francesco Rodriguez committed Jul 2, 2012
Commits on Jun 29, 2012
  1. make sure the inflection rules are loaded when cherry-picking active_…

    …support/core_ext/string/inflections.rb [fixes #6884]
    fxn committed Jun 29, 2012