| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #5537 from kennyj/fix_4399-32 | Aaron Patterson | 2012-03-23 | 2 | -6/+34 |
|\ |
|
| * | migrate(:down) method with table_name_prefix | kennyj | 2012-03-21 | 2 | -6/+34 |
* | | Fix identity map tests | Carlos Antonio da Silva | 2012-03-23 | 1 | -16/+16 |
* | | Add order to tests that rely on db ordering, to fix failing tests on pg | Carlos Antonio da Silva | 2012-03-22 | 13 | -46/+45 |
* | | [3-2-stable] Port of #5522 'Fix adding/removing field's index when generating... | Marcelo Silveira | 2012-03-21 | 1 | -0/+3 |
* | | [3-2-stable] Remove blank line from generated migration | Marcelo Silveira | 2012-03-20 | 1 | -1/+1 |
|/ |
|
* | Fix GH #5435. db:structure:dump should be re-enable. | kennyj | 2012-03-18 | 1 | -0/+1 |
* | Merge pull request #5437 from kennyj/fix_5430 | Aaron Patterson | 2012-03-15 | 2 | -1/+8 |
* | ConnectionPool.checkout takes account of ruby using 'non-blocking condition v... | Jonathan Rochkind | 2012-03-13 | 1 | -9/+18 |
* | [3-2-stable] Fix GH #5399. connection_pools's keys are ActiveRecord::Base::Co... | kennyj | 2012-03-14 | 2 | -2/+8 |
* | fix activerecord query_method regression with offset into Fixnum | Denis Jean | 2012-03-13 | 2 | -1/+5 |
* | make sure connections returned after close are marked as in_use | Aaron Patterson | 2012-03-12 | 2 | -0/+26 |
* | Merge pull request #5391 from jrochkind/connection_pool_doc | Aaron Patterson | 2012-03-12 | 1 | -3/+1 |
|\ |
|
| * | inline docs for clear_active_connections! no longer says it cleans dead threa... | Jonathan Rochkind | 2012-03-12 | 1 | -3/+1 |
* | | Add documentation for find_or_create_by_{attribute}! method. | Andrew White | 2012-03-12 | 1 | -0/+3 |
|/ |
|
* | Add dynamic find_or_create_by_{attribute}! method. | Andrew White | 2012-03-12 | 7 | -1/+67 |
* | Merge pull request #5347 from rafaelfranca/fix-has_many_association-3-2 | José Valim | 2012-03-08 | 6 | -8/+43 |
|\ |
|
| * | Not need to pass join attributes to association build | Rafael Mendonça França | 2012-03-08 | 5 | -16/+21 |
| * | Add test case to has_many through association when mass_assignment_sanitizer is | Rafael Mendonça França | 2012-03-08 | 4 | -4/+34 |
* | | Fix my name in the CHANGELOG to follow the convention | Rafael Mendonça França | 2012-03-09 | 1 | -2/+11 |
|/ |
|
* | ensure that released connections move between threads | Aaron Patterson | 2012-03-08 | 1 | -0/+18 |
* | make active_connection? return true only if there is an open connection in us... | Aaron Patterson | 2012-03-08 | 2 | -3/+46 |
* | changelog updates [ci skip] | Vijay Dev | 2012-03-09 | 1 | -0/+14 |
* | Fix doc examples for has_and_belongs_to_many association | Braden Schaeffer | 2012-03-09 | 1 | -2/+2 |
* | Add tests to test that through associations are not readonly, and we can upda... | kuahyeow | 2012-03-08 | 1 | -0/+11 |
* | Merge pull request #5316 from Jacobkg/master | José Valim | 2012-03-07 | 2 | -1/+4 |
* | Fix #5069 - Protect foreign key from mass assignment throught association bui... | Jean Boussier | 2012-03-05 | 3 | -1/+40 |
* | Whitelist all attribute assignment by default. | Michael Koziarski | 2012-03-05 | 2 | -0/+9 |
* | Only run binary type cast test with encode! on Ruby 1.9 | Carlos Antonio da Silva | 2012-03-04 | 1 | -6/+8 |
* | fix associations when using per class databases | Lars Kanis | 2012-03-04 | 3 | -8/+5 |
* | only log an error if there is a logger. fixes #5226 | Aaron Patterson | 2012-03-02 | 3 | -2/+11 |
* | revert setting NOT NULL constraints in add_timestamps | Xavier Noria | 2012-03-01 | 1 | -2/+2 |
* | Merge branch '3-2-2' into 3-2-stable | Aaron Patterson | 2012-03-01 | 1 | -1/+1 |
|\ |
|
| * | bumping to 3.2.2 | Aaron Patterson | 2012-03-01 | 1 | -1/+1 |
| * | Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepare | Aaron Patterson | 2012-02-23 | 1 | -1/+1 |
| * | updating RAILS_VERSION | Aaron Patterson | 2012-02-22 | 1 | -2/+2 |
* | | Fix type_to_sql with text and limit on mysql/mysql2. Fix GH #3931. | kennyj | 2012-02-29 | 3 | -12/+23 |
* | | Revert "No need to pass options which is never used" | Rafael Mendonça França | 2012-02-26 | 1 | -2/+2 |
* | | Fixed typo in composed_of example with Money#<=>, was comparing amount itself... | Noah Hendrix | 2012-02-25 | 1 | -1/+1 |
* | | Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepare | Aaron Patterson | 2012-02-23 | 1 | -1/+1 |
|/ |
|
* | bumping up arel | Aaron Patterson | 2012-02-21 | 1 | -1/+1 |
* | prepared statements can be disabled | Aaron Patterson | 2012-02-21 | 8 | -30/+56 |
* | tag bind params with a bind param object | Aaron Patterson | 2012-02-21 | 3 | -3/+3 |
* | more ruby 2.0 respond_to? changes | Aaron Patterson | 2012-02-21 | 1 | -1/+1 |
* | Merge pull request #5096 from lawso017/master | Aaron Patterson | 2012-02-21 | 2 | -19/+43 |
* | Fix some warnings on 3-2-stable | kennyj | 2012-02-21 | 1 | -1/+1 |
* | fix test with ruby 187-p358 | Arun Agrawal | 2012-02-18 | 1 | -1/+5 |
* | Merge pull request #5038 from carlosantoniodasilva/fix-db-migrate-redo | José Valim | 2012-02-14 | 1 | -1/+4 |
* | Use real table and columns for index test | Rafael Mendonça França | 2012-02-08 | 1 | -3/+3 |
* | Push proper test changes for previous commit conflicts. | José Valim | 2012-02-08 | 1 | -2/+4 |