aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5537 from kennyj/fix_4399-32Aaron Patterson2012-03-232-6/+34
|\
| * migrate(:down) method with table_name_prefixkennyj2012-03-212-6/+34
* | Fix identity map testsCarlos Antonio da Silva2012-03-231-16/+16
* | Add order to tests that rely on db ordering, to fix failing tests on pgCarlos Antonio da Silva2012-03-2213-46/+45
* | [3-2-stable] Port of #5522 'Fix adding/removing field's index when generating...Marcelo Silveira2012-03-211-0/+3
* | [3-2-stable] Remove blank line from generated migrationMarcelo Silveira2012-03-201-1/+1
|/
* Fix GH #5435. db:structure:dump should be re-enable.kennyj2012-03-181-0/+1
* Merge pull request #5437 from kennyj/fix_5430Aaron Patterson2012-03-152-1/+8
* ConnectionPool.checkout takes account of ruby using 'non-blocking condition v...Jonathan Rochkind2012-03-131-9/+18
* [3-2-stable] Fix GH #5399. connection_pools's keys are ActiveRecord::Base::Co...kennyj2012-03-142-2/+8
* fix activerecord query_method regression with offset into FixnumDenis Jean2012-03-132-1/+5
* make sure connections returned after close are marked as in_useAaron Patterson2012-03-122-0/+26
* Merge pull request #5391 from jrochkind/connection_pool_docAaron Patterson2012-03-121-3/+1
|\
| * inline docs for clear_active_connections! no longer says it cleans dead threa...Jonathan Rochkind2012-03-121-3/+1
* | Add documentation for find_or_create_by_{attribute}! method.Andrew White2012-03-121-0/+3
|/
* Add dynamic find_or_create_by_{attribute}! method.Andrew White2012-03-127-1/+67
* Merge pull request #5347 from rafaelfranca/fix-has_many_association-3-2José Valim2012-03-086-8/+43
|\
| * Not need to pass join attributes to association buildRafael Mendonça França2012-03-085-16/+21
| * Add test case to has_many through association when mass_assignment_sanitizer isRafael Mendonça França2012-03-084-4/+34
* | Fix my name in the CHANGELOG to follow the conventionRafael Mendonça França2012-03-091-2/+11
|/
* ensure that released connections move between threadsAaron Patterson2012-03-081-0/+18
* make active_connection? return true only if there is an open connection in us...Aaron Patterson2012-03-082-3/+46
* changelog updates [ci skip]Vijay Dev2012-03-091-0/+14
* Fix doc examples for has_and_belongs_to_many associationBraden Schaeffer2012-03-091-2/+2
* Add tests to test that through associations are not readonly, and we can upda...kuahyeow2012-03-081-0/+11
* Merge pull request #5316 from Jacobkg/masterJosé Valim2012-03-072-1/+4
* Fix #5069 - Protect foreign key from mass assignment throught association bui...Jean Boussier2012-03-053-1/+40
* Whitelist all attribute assignment by default.Michael Koziarski2012-03-052-0/+9
* Only run binary type cast test with encode! on Ruby 1.9Carlos Antonio da Silva2012-03-041-6/+8
* fix associations when using per class databasesLars Kanis2012-03-043-8/+5
* only log an error if there is a logger. fixes #5226Aaron Patterson2012-03-023-2/+11
* revert setting NOT NULL constraints in add_timestampsXavier Noria2012-03-011-2/+2
* Merge branch '3-2-2' into 3-2-stableAaron Patterson2012-03-011-1/+1
|\
| * bumping to 3.2.2Aaron Patterson2012-03-011-1/+1
| * Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepareAaron Patterson2012-02-231-1/+1
| * updating RAILS_VERSIONAaron Patterson2012-02-221-2/+2
* | Fix type_to_sql with text and limit on mysql/mysql2. Fix GH #3931.kennyj2012-02-293-12/+23
* | Revert "No need to pass options which is never used"Rafael Mendonça França2012-02-261-2/+2
* | Fixed typo in composed_of example with Money#<=>, was comparing amount itself...Noah Hendrix2012-02-251-1/+1
* | Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepareAaron Patterson2012-02-231-1/+1
|/
* bumping up arelAaron Patterson2012-02-211-1/+1
* prepared statements can be disabledAaron Patterson2012-02-218-30/+56
* tag bind params with a bind param objectAaron Patterson2012-02-213-3/+3
* more ruby 2.0 respond_to? changesAaron Patterson2012-02-211-1/+1
* Merge pull request #5096 from lawso017/masterAaron Patterson2012-02-212-19/+43
* Fix some warnings on 3-2-stablekennyj2012-02-211-1/+1
* fix test with ruby 187-p358Arun Agrawal2012-02-181-1/+5
* Merge pull request #5038 from carlosantoniodasilva/fix-db-migrate-redoJosé Valim2012-02-141-1/+4
* Use real table and columns for index testRafael Mendonça França2012-02-081-3/+3
* Push proper test changes for previous commit conflicts.José Valim2012-02-081-2/+4