Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | No need to override to_yaml and yaml_initialize methods in ActiveRecord::Core | Rafael Mendonça França | 2012-01-04 | 1 | -20/+0 | |
| | | | | ||||||
* | | | | No need to use rescue block to require psych | Rafael Mendonça França | 2012-01-04 | 4 | -34/+17 | |
| | | | | ||||||
* | | | | No need to check if YAML::ENGINE is defined since ruby 1.9 does that | Rafael Mendonça França | 2012-01-04 | 1 | -1/+1 | |
| |_|/ |/| | | ||||||
* | | | create_fixtures should accept symbol keys for custom table -> class ↵ | Jeremy Kemper | 2012-01-03 | 2 | -4/+14 | |
| | | | | | | | | | | | | mappings. Fixes an unintended regression. | |||||
* | | | Fix GH #4285. Remove options when we record calling creat_table | kennyj | 2012-01-04 | 2 | -1/+7 | |
| | | | ||||||
* | | | use File.basename to get the filename minus .yml | Aaron Patterson | 2012-01-03 | 1 | -2/+3 | |
| | | | ||||||
* | | | setup_fixture_accessors should accept symbols for table names. Fixes an ↵ | Jeremy Kemper | 2012-01-03 | 2 | -1/+2 | |
| | | | | | | | | | | | | unintended (and untested) regression. | |||||
* | | | Merge pull request #2955 from dmitry/master | Aaron Patterson | 2012-01-03 | 5 | -9/+19 | |
|\ \ \ | | | | | | | | | Polymorphic with optimistic lock and counter cache should be destroyed | |||||
| * | | | Removed metaclass from the has_many dependency destroy method. Fixes #2954 | Dmitry Polushkin | 2011-12-31 | 2 | -8/+5 | |
| | | | | ||||||
| * | | | Merge branch 'master' of git://github.com/rails/rails | Dmitry Polushkin | 2011-12-31 | 225 | -10667/+13689 | |
| |\ \ \ | ||||||
| * \ \ \ | Merge branch 'master' of git://github.com/rails/rails | Dmitry Polushkin | 2011-10-05 | 14 | -19/+57 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'master' of git://github.com/rails/rails | Dmitry Polushkin | 2011-10-01 | 16 | -29/+140 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'master' of git://github.com/rails/rails | Dmitry Polushkin | 2011-09-15 | 22 | -123/+212 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | Test polymorphic record with optimistic locking and counter cache should be ↵ | Dmitry Polushkin | 2011-09-09 | 3 | -1/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |
| |_|_|_|_|/ / |/| | | | | | | ||||||
* | | | | | | | Rails::Plugin has gone | Santiago Pastorino | 2012-01-03 | 1 | -1/+1 | |
| |_|_|_|_|/ |/| | | | | | ||||||
* | | | | | | remove ActiveSupport::Base64 in favor of ::Base64 | Sergey Nartimov | 2012-01-02 | 1 | -4/+4 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #4248 from andrew/2012 | Vijay Dev | 2011-12-31 | 2 | -2/+2 | |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Updated copyright notices for 2012 | |||||
| * | | | | | Updated copyright notices for 2012 | Andrew Nesbitt | 2011-12-31 | 2 | -2/+2 | |
| | | | | | | ||||||
* | | | | | | updating the reaping frequency documentation | Aaron Patterson | 2011-12-30 | 1 | -0/+3 | |
| | | | | | | ||||||
* | | | | | | rename start to run and use Thread.pass rather than sleeping to schedule the ↵ | Aaron Patterson | 2011-12-30 | 2 | -23/+31 | |
| | | | | | | | | | | | | | | | | | | | | | | | | watchdog | |||||
* | | | | | | connection pool starts the reaper | Aaron Patterson | 2011-12-30 | 2 | -0/+17 | |
| | | | | | | ||||||
* | | | | | | 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 | 2 | -0/+16 | |
| | | | | | | ||||||
* | | | | | | each connection pool has a reaper | Aaron Patterson | 2011-12-30 | 3 | -2/+18 | |
| | | | | | | ||||||
* | | | | | | introduce a timer class for reaping connections | Aaron Patterson | 2011-12-30 | 2 | -0/+65 | |
| | | | | | | ||||||
* | | | | | | raise a pull full error when the connection pool is full and no connection ↵ | Aaron Patterson | 2011-12-30 | 2 | -18/+28 | |
| | | | | | | | | | | | | | | | | | | | | | | | | can be obtained | |||||
* | | | | | | connections are only removed if they are inactve | Aaron Patterson | 2011-12-30 | 2 | -3/+19 | |
| | | | | | | ||||||
* | | | | | | connections can be reaped via the `reap` method | Aaron Patterson | 2011-12-30 | 2 | -0/+27 | |
| | | | | | | ||||||
* | | | | | | deal with removing connections associated with the current thread | Aaron Patterson | 2011-12-30 | 2 | -0/+15 | |
| | | | | | | ||||||
* | | | | | | connections can be removed from the pool | Aaron Patterson | 2011-12-30 | 2 | -1/+28 | |
| | | | | | | ||||||
* | | | | | | queue and signal no longer needed | Aaron Patterson | 2011-12-30 | 1 | -2/+0 | |
| | | | | | | ||||||
* | | | | | | refactor checking out the connection | Aaron Patterson | 2011-12-30 | 1 | -5/+6 | |
| | | | | | | ||||||
* | | | | | | infinite loop is no longer necessary | Aaron Patterson | 2011-12-30 | 1 | -20/+11 | |
| | | | | | | ||||||
* | | | | | | connections must be checked in at the end of a thread | Aaron Patterson | 2011-12-30 | 3 | -31/+7 | |
| | | | | | | ||||||
* | | | | | | Fixes for TestFixtures::setup_fixture_accessors | Alexey Muranov | 2011-12-30 | 1 | -6/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed "fixture_name" to "accessor_name" and made fixture names in the form "admin/users" be used as the key for the hashes @fixture_cache and @loaded_fixtures. Previously the variable "fixture_name" here was getting a value of the form "admin_user", and this value was then used as the hash key. | |||||
* | | | | | | Fixture's table name be defined in the model | Alexey Muranov | 2011-12-30 | 1 | -10/+17 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Made the fixture's table name be taken from its model class whenever this class responds to table_name, instead of inferring it sometimes from the fixture's pass. The previous behavior seemed buggy because it depended on whether the model class was passed as a constant or as a name string. Improved Fixtures#initialize. | |||||
* | | | | | | Test case: fixture table name is defined in model | Alexey Muranov | 2011-12-30 | 1 | -0/+5 | |
| | | | | | | ||||||
* | | | | | | Use foo/bar instead of foo_bar keys for fixtures | Alexey Muranov | 2011-12-30 | 1 | -12/+25 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This solves an issue with set_fixture_class class method caused by create_fixtures method's overwriting passed to it fixture model classes, when the fixtures are "namespased": foo/bar or admin/users. The idea is to use "foo/bar" string as the name and identifier of a fixture file bar in directory foo. The model class of the fixture is either set with set_fixture_class method, or otherwise inferred from its name using camelize method. Also a bug is fixed in lines 487-489 when the table names were guessed by substitution from the fixture file names, ambiguously called table_names, instead of being taken from fixture attributes. Now they are taken from attributes. I plan to submit another fix so that the fixture's table name (for example foo_bar) be defined by the fixture's model whenever possible, instead of inferring it from the fixture's name ("foo/bar"). | |||||
* | | | | | | Test fixtures with custom model and table names | Alexey Muranov | 2011-12-30 | 7 | -0/+60 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
* | | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-12-29 | 3 | -11/+4 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | typo | Jo Liss | 2011-12-28 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Document that index names are made up of all columns, not just the first. | Jo Liss | 2011-12-27 | 1 | -9/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | index_name has been using the following expression "index_#{table_name}_on_#{Array.wrap(options[:column]) * '_and_'}" since at least 2006 (bc7f2315), and that's how they come out in my DB. Please check that this is correct before merging into master, perhaps I'm misunderstanding the section I changed. | |||||
| * | | | | | | Remove unnecessary comma. | Uģis Ozols | 2011-12-26 | 1 | -1/+1 | |
| | | | | | | | ||||||
* | | | | | | | Deprecate implicit eager loading. Closes #950. | Jon Leighton | 2011-12-29 | 27 | -99/+181 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #4216 from edgecase/master_fix_reorder_with_limited_ids | Aaron Patterson | 2011-12-28 | 2 | -1/+11 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | allow reorder to affect eager loading correctly | |||||
| * | | | | | | | allow reorder to affect eager loading correctly | Matt Jones + Scott Walker | 2011-12-28 | 2 | -1/+11 | |
| | | | | | | | | ||||||
* | | | | | | | | Fix CI | Jon Leighton | 2011-12-28 | 5 | -25/+25 | |
| | | | | | | | | ||||||
* | | | | | | | | app code in general wants Time.current, not Time.now | Xavier Noria | 2011-12-28 | 1 | -3/+3 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #4222 from amatsuda/ar_predicate_builder_refactor | Aaron Patterson | 2011-12-28 | 1 | -35/+37 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | refactor AR::PredicateBuilder.build_from_hash |