Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Feb 22, 2012
  1. @tenderlove

    updating RAILS_VERSION

    tenderlove authored
  2. @tenderlove

    bumping up arel

    tenderlove authored
  3. @tenderlove
Commits on Feb 21, 2012
  1. @tenderlove
  2. @tenderlove
  3. @tenderlove

    Merge pull request #5096 from lawso017/master

    tenderlove authored
    Restoring ability to derive id/sequence from tables with nonstandard sequences for primary keys
  4. @kennyj

    Fix some warnings on 3-2-stable

    kennyj authored
Commits on Feb 18, 2012
  1. @arunagw

    fix test with ruby 187-p358

    arunagw authored
Commits on Feb 14, 2012
  1. @josevalim

    Merge pull request #5038 from carlosantoniodasilva/fix-db-migrate-redo

    josevalim authored josevalim committed
    Always reenable _dump task in AR databases rake. Closes #5030
Commits on Feb 8, 2012
  1. @rafaelfranca
  2. @josevalim
  3. @paul @josevalim

    Handle nil in add_index :length option in MySQL

    paul authored josevalim committed
    Our schema.rb is being generated with an `add_index` line similar to this:
    
        add_index "foo", ["foo", "bar"], :name => "xxx", :length => {"foo"=>8, "bar=>nil}
    
    This is the same as it was on Rails 3.1.3, however, now when that
    schema.rb is evaluated, its generating bad SQL in MySQL:
    
        Mysql::Error: You have an error in your SQL syntax; check the manual
        that corresponds to your MySQL server version for the right syntax
        to use near '))' at line 1: CREATE UNIQUE INDEX
        `xxx` ON `foo` (`foo`(8), `bar`())
    
    This commit adds a check for nil on the length attribute to prevent the
    empty parens from being output.
    
    Conflicts:
    
    	activerecord/test/cases/migration/index_test.rb
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
Commits on Feb 7, 2012
  1. @jonleighton

    Fix attribute_before_type_cast for serialized attributes. Fixes #4837.

    jonleighton authored
    Conflicts:
    
    	activerecord/lib/active_record/core.rb
  2. @fxn
  3. @iblue @fxn

    Fixed the documenation for 'to_xml'

    iblue authored fxn committed
Commits on Feb 4, 2012
  1. @fxn
Commits on Feb 3, 2012
  1. @skult

    Fix Issue #4819

    skult authored
    'uninitialized constant ActiveRecord::Deprecation in Rails3.2.1'
    
    Just a typo of 'ActiveSupport::...'
Commits on Feb 2, 2012
  1. @tenderlove

    Merge pull request #4809 from cfeist/feist-sqlite-binary-corruption

    tenderlove authored
    Fix for SQLite binary data corrupter (to master branch)
Commits on Feb 1, 2012
  1. @jonleighton

    Merge pull request #4543 from jdelStrother/find_or_init

    jonleighton authored
    Don't instantiate two objects in collection proxy / find_or_instantiate_by
  2. @rafaelfranca
Commits on Jan 31, 2012
  1. @jonleighton
  2. @jonleighton

    Merge pull request #4783 from gregolsen/ids_reader_fix

    jonleighton authored
    ids_reader method fixed, test added to has_many association (for PostgreSQL)
  3. @jonleighton
  4. @jonleighton
  5. @jonleighton

    Merge pull request #4763 from kennyj/fix_4754

    jonleighton authored
    [MySQL] Fix GH #4754. Remove double-quote characters around PK when using sql_mode=ANSI_QUOTES
Commits on Jan 30, 2012
  1. @fxn
Commits on Jan 27, 2012
  1. @jonleighton

    Merge pull request #4715 from pwim/find-create-multi-args

    jonleighton authored
    Fix regression from Rails 3.1
Commits on Jan 26, 2012
  1. @fxn

    updating RAILS_VERSION

    fxn authored
  2. @fxn

    CHANGELOG revision for v3.2.1

    fxn authored
  3. @tenderlove

    Merge pull request #4696 from rafaelfranca/issue-4653

    tenderlove authored
    Remove extra attributes from HABTM join tables in AR tests
  4. @rafaelfranca

    Remove extra attributes from HABTM join tables in AR tests

    rafaelfranca authored
    HABTM Join tables should not have extra attributes
    
    When extra attributes is needed in HABTM join tables is better to use
    `has_many :through` association.
    
    Fix #4653
  5. @fxn

    registers 2483460 in the CHANGELOG

    fxn authored
  6. @fxn
  7. @lest @josevalim

    call to_s on value passed to table_name=

    lest authored josevalim committed
    Signed-off-by: José Valim <jose.valim@gmail.com>
Commits on Jan 20, 2012
  1. @jonleighton

    Fix another race condition.

    jonleighton authored
    From 2c667f6.
    
    Thanks @pwnall for the heads-up.
    
    Conflicts:
    
    	activerecord/lib/active_record/core.rb
Something went wrong with that request. Please try again.