Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Merge pull request #2325 from pyromaniac/master" | José Valim | 2012-01-06 | 1 | -12/+0 |
| | | | | | | | It breaks the build for mysql. This reverts commit 958d25df4a1b0d41ce5deeeb0739c93b49bbd18d, reversing changes made to 8f309e31057e1b26fefedb199ab0526126fb1fe4. | ||||
* | Merge pull request #4343 from carlosantoniodasilva/activerecord-1.9-compat | José Valim | 2012-01-05 | 2 | -4/+4 |
|\ | | | | | Activerecord 1.9 compat | ||||
| * | Revert "Regexp.union seems to have different results in 1.8" | Carlos Antonio da Silva | 2012-01-06 | 1 | -3/+3 |
| | | | | | | | | | | | | This reverts commit d80e4ee20e690dfc0f4ec31c41b873d607462872. No need to care about 1.8 anymore, so reverting :) | ||||
| * | Revert "Add return for 1.8.7" | Carlos Antonio da Silva | 2012-01-06 | 1 | -1/+1 |
| | | | | | | | | | | | | This reverts commit 665ef116ac9000d514c03fc61b216513f5cb7b25. There is no need for the return anymore, so reverting. | ||||
* | | Fixed nil field value uniqueness check | pyromaniac | 2012-01-06 | 1 | -0/+12 |
|/ | |||||
* | test a subclass so that the removed method does not imact other tests | Aaron Patterson | 2012-01-05 | 1 | -2/+5 |
| | |||||
* | do not require a file that is not used | Aaron Patterson | 2012-01-05 | 1 | -0/+1 |
| | |||||
* | Merge pull request #4301 from Karunakar/refactor_tests | Aaron Patterson | 2012-01-05 | 1 | -4/+7 |
|\ | | | | | Refactor tests | ||||
| * | removed unnecessary +1 from assert_difference because default difference is 1 | Karunakar (Ruby) | 2012-01-05 | 1 | -1/+1 |
| | | |||||
| * | refactored tests -- assert_diffrence instead of checking directly with count | Karunakar (Ruby) | 2012-01-04 | 1 | -4/+7 |
| | | |||||
* | | Merge pull request #4315 from larskanis/allow_setting_of_pgconn_params | Aaron Patterson | 2012-01-05 | 1 | -0/+15 |
|\ \ | | | | | | | PostgreSQL: Allow consistent setting of libpq params in database connection specification | ||||
| * | | Postgresql: add test case for setting custom libpq connection parameters | Lars Kanis | 2012-01-04 | 1 | -0/+15 |
| | | | |||||
* | | | call super from setup | Aaron Patterson | 2012-01-04 | 1 | -0/+1 |
| | | | |||||
* | | | call super | Aaron Patterson | 2012-01-04 | 1 | -0/+10 |
| | | | |||||
* | | | Merge pull request #4282 from edgecase/order_after_reorder | Aaron Patterson | 2012-01-04 | 2 | -1/+7 |
|\ \ \ | | | | | | | | | correctly handle order calls after a reorder | ||||
| * | | | correctly handle order calls after a reorder | Matt Jones + Scott Walker | 2012-01-03 | 2 | -1/+7 |
| |/ / | |||||
* | | | No need to require psych since require yaml does that. | Rafael Mendonça França | 2012-01-04 | 1 | -1/+0 |
| | | | |||||
* | | | No need to use rescue block to require psych | Rafael Mendonça França | 2012-01-04 | 1 | -18/+14 |
| |/ |/| | |||||
* | | create_fixtures should accept symbol keys for custom table -> class ↵ | Jeremy Kemper | 2012-01-03 | 1 | -2/+10 |
| | | | | | | | | mappings. Fixes an unintended regression. | ||||
* | | Fix GH #4285. Remove options when we record calling creat_table | kennyj | 2012-01-04 | 1 | -0/+6 |
| | | |||||
* | | setup_fixture_accessors should accept symbols for table names. Fixes an ↵ | Jeremy Kemper | 2012-01-03 | 1 | -1/+1 |
| | | | | | | | | unintended (and untested) regression. | ||||
* | | Merge pull request #2955 from dmitry/master | Aaron Patterson | 2012-01-03 | 1 | -0/+12 |
|\ \ | | | | | | | Polymorphic with optimistic lock and counter cache should be destroyed | ||||
| * | | Merge branch 'master' of git://github.com/rails/rails | Dmitry Polushkin | 2011-12-31 | 79 | -849/+2158 |
| |\| | |||||
| * | | Merge branch 'master' of git://github.com/rails/rails | Dmitry Polushkin | 2011-10-05 | 3 | -4/+18 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' of git://github.com/rails/rails | Dmitry Polushkin | 2011-10-01 | 6 | -3/+57 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' of git://github.com/rails/rails | Dmitry Polushkin | 2011-09-15 | 7 | -62/+65 |
| |\ \ \ \ | |||||
| * | | | | | Test polymorphic record with optimistic locking and counter cache should be ↵ | Dmitry Polushkin | 2011-09-09 | 1 | -0/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | destoyed without catching the ActiveRecord::StaleObjectError. | ||||
* | | | | | | actually disconnect from the database at the end of each test | Aaron Patterson | 2012-01-03 | 1 | -2/+2 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | rename start to run and use Thread.pass rather than sleeping to schedule the ↵ | Aaron Patterson | 2011-12-30 | 1 | -21/+29 |
| | | | | | | | | | | | | | | | | | | | | watchdog | ||||
* | | | | | connection pool starts the reaper | Aaron Patterson | 2011-12-30 | 1 | -0/+16 |
| | | | | | |||||
* | | | | | just dup the spec now that it will deep copy | Aaron Patterson | 2011-12-30 | 1 | -2/+1 |
| | | | | | |||||
* | | | | | connection specification will deep copy the config | Aaron Patterson | 2011-12-30 | 1 | -0/+12 |
| | | | | | |||||
* | | | | | each connection pool has a reaper | Aaron Patterson | 2011-12-30 | 1 | -0/+12 |
| | | | | | |||||
* | | | | | introduce a timer class for reaping connections | Aaron Patterson | 2011-12-30 | 1 | -0/+46 |
| | | | | | |||||
* | | | | | raise a pull full error when the connection pool is full and no connection ↵ | Aaron Patterson | 2011-12-30 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | can be obtained | ||||
* | | | | | connections are only removed if they are inactve | Aaron Patterson | 2011-12-30 | 1 | -2/+18 |
| | | | | | |||||
* | | | | | connections can be reaped via the `reap` method | Aaron Patterson | 2011-12-30 | 1 | -0/+15 |
| | | | | | |||||
* | | | | | deal with removing connections associated with the current thread | Aaron Patterson | 2011-12-30 | 1 | -0/+8 |
| | | | | | |||||
* | | | | | connections can be removed from the pool | Aaron Patterson | 2011-12-30 | 1 | -0/+19 |
| | | | | | |||||
* | | | | | connections must be checked in at the end of a thread | Aaron Patterson | 2011-12-30 | 1 | -14/+3 |
| | | | | | |||||
* | | | | | Test case: fixture table name is defined in model | Alexey Muranov | 2011-12-30 | 1 | -0/+5 |
| | | | | | |||||
* | | | | | Test fixtures with custom model and table names | Alexey Muranov | 2011-12-30 | 1 | -0/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test using fixtures with random names and model names, that is not following naming conventions but using set_fixture_class instead. It is expected that the table name be defined in the model, but this is not explicitly tested here. This will need to be fixed. | ||||
* | | | | | Deprecate implicit eager loading. Closes #950. | Jon Leighton | 2011-12-29 | 18 | -89/+157 |
| | | | | | |||||
* | | | | | Merge pull request #4216 from edgecase/master_fix_reorder_with_limited_ids | Aaron Patterson | 2011-12-28 | 1 | -0/+10 |
|\ \ \ \ \ | | | | | | | | | | | | | allow reorder to affect eager loading correctly | ||||
| * | | | | | allow reorder to affect eager loading correctly | Matt Jones + Scott Walker | 2011-12-28 | 1 | -0/+10 |
| | | | | | | |||||
* | | | | | | Fix CI | Jon Leighton | 2011-12-28 | 5 | -25/+25 |
| | | | | | | |||||
* | | | | | | Support establishing connection on ActiveRecord::Model. | Jon Leighton | 2011-12-28 | 6 | -11/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the 'top level' connection, inherited by any models that include ActiveRecord::Model or inherit from ActiveRecord::Base. | ||||
* | | | | | | Support configuration on ActiveRecord::Model. | Jon Leighton | 2011-12-28 | 2 | -27/+0 |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem: We need to be able to specify configuration in a way that can be inherited to models that include ActiveRecord::Model. So it is no longer sufficient to put 'top level' config on ActiveRecord::Base, but we do want configuration specified on ActiveRecord::Base and descendants to continue to work. So we need something like class_attribute that can be defined on a module but that is inherited when ActiveRecord::Model is included. The solution: added ActiveModel::Configuration module which provides a config_attribute macro. It's a bit specific hence I am not putting this in Active Support or making it a 'public API' at present. | ||||
* | | | | | Fix a fixtures test case with table prefix/suffix | Alexey Muranov | 2011-12-27 | 1 | -23/+37 |
| | | | | | | | | | | | | | | | | | | | | Make sure the table name of a model is reset in a test case after assigning ActiveRecord::Base.table_name_prefix and ActiveRecord::Base.table_name_suffix. | ||||
* | | | | | remove checks for encodings availability | Sergey Nartimov | 2011-12-25 | 4 | -20/+10 |
| | | | | |