aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Merge branch 'master' of git://github.com/rails/railsDmitry Polushkin2011-10-0514-19/+57
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of git://github.com/rails/railsDmitry Polushkin2011-10-0116-29/+140
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of git://github.com/rails/railsDmitry Polushkin2011-09-1522-123/+212
| |\ \ \ \ \ \
| * | | | | | | Test polymorphic record with optimistic locking and counter cache should be ↵Dmitry Polushkin2011-09-093-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | destoyed without catching the ActiveRecord::StaleObjectError.
* | | | | | | | actually disconnect from the database at the end of each testAaron Patterson2012-01-031-2/+2
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Rails::Plugin has goneSantiago Pastorino2012-01-031-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | remove ActiveSupport::Base64 in favor of ::Base64Sergey Nartimov2012-01-021-4/+4
| | | | | |
* | | | | | Merge pull request #4248 from andrew/2012Vijay Dev2011-12-312-2/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Updated copyright notices for 2012
| * | | | | Updated copyright notices for 2012Andrew Nesbitt2011-12-312-2/+2
| | | | | |
* | | | | | updating the reaping frequency documentationAaron Patterson2011-12-301-0/+3
| | | | | |
* | | | | | rename start to run and use Thread.pass rather than sleeping to schedule the ↵Aaron Patterson2011-12-302-23/+31
| | | | | | | | | | | | | | | | | | | | | | | | watchdog
* | | | | | connection pool starts the reaperAaron Patterson2011-12-302-0/+17
| | | | | |
* | | | | | just dup the spec now that it will deep copyAaron Patterson2011-12-301-2/+1
| | | | | |
* | | | | | connection specification will deep copy the configAaron Patterson2011-12-302-0/+16
| | | | | |
* | | | | | each connection pool has a reaperAaron Patterson2011-12-303-2/+18
| | | | | |
* | | | | | introduce a timer class for reaping connectionsAaron Patterson2011-12-302-0/+65
| | | | | |
* | | | | | raise a pull full error when the connection pool is full and no connection ↵Aaron Patterson2011-12-302-18/+28
| | | | | | | | | | | | | | | | | | | | | | | | can be obtained
* | | | | | connections are only removed if they are inactveAaron Patterson2011-12-302-3/+19
| | | | | |
* | | | | | connections can be reaped via the `reap` methodAaron Patterson2011-12-302-0/+27
| | | | | |
* | | | | | deal with removing connections associated with the current threadAaron Patterson2011-12-302-0/+15
| | | | | |
* | | | | | connections can be removed from the poolAaron Patterson2011-12-302-1/+28
| | | | | |
* | | | | | queue and signal no longer neededAaron Patterson2011-12-301-2/+0
| | | | | |
* | | | | | refactor checking out the connectionAaron Patterson2011-12-301-5/+6
| | | | | |
* | | | | | infinite loop is no longer necessaryAaron Patterson2011-12-301-20/+11
| | | | | |
* | | | | | connections must be checked in at the end of a threadAaron Patterson2011-12-303-31/+7
| | | | | |
* | | | | | Fixes for TestFixtures::setup_fixture_accessorsAlexey Muranov2011-12-301-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 modelAlexey Muranov2011-12-301-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 modelAlexey Muranov2011-12-301-0/+5
| | | | | |
* | | | | | Use foo/bar instead of foo_bar keys for fixturesAlexey Muranov2011-12-301-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 namesAlexey Muranov2011-12-307-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/docrailsVijay Dev2011-12-293-11/+4
|\ \ \ \ \ \
| * | | | | | typoJo Liss2011-12-281-1/+1
| | | | | | |
| * | | | | | Document that index names are made up of all columns, not just the first.Jo Liss2011-12-271-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 Ozols2011-12-261-1/+1
| | | | | | |
* | | | | | | Deprecate implicit eager loading. Closes #950.Jon Leighton2011-12-2927-99/+181
| | | | | | |
* | | | | | | Merge pull request #4216 from edgecase/master_fix_reorder_with_limited_idsAaron Patterson2011-12-282-1/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | allow reorder to affect eager loading correctly
| * | | | | | | allow reorder to affect eager loading correctlyMatt Jones + Scott Walker2011-12-282-1/+11
| | | | | | | |
* | | | | | | | Fix CIJon Leighton2011-12-285-25/+25
| | | | | | | |
* | | | | | | | app code in general wants Time.current, not Time.nowXavier Noria2011-12-281-3/+3
| | | | | | | |
* | | | | | | | Merge pull request #4222 from amatsuda/ar_predicate_builder_refactorAaron Patterson2011-12-281-35/+37
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | refactor AR::PredicateBuilder.build_from_hash
| * | | | | | | | refactor AR::PredicateBuilder.build_from_hashAkira Matsuda2011-12-291-35/+37
| | | | | | | | |
* | | | | | | | | Delete some stray linesJon Leighton2011-12-282-3/+0
|/ / / / / / / /
* | | | | | | | Avoid deprecation warningJon Leighton2011-12-281-1/+1
| | | | | | | |
* | | | | | | | Support establishing connection on ActiveRecord::Model.Jon Leighton2011-12-2825-230/+251
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Leighton2011-12-2821-208/+190
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | Merge pull request #4213 from amatsuda/ar_where_array_of_nil_and_a_valueJon Leighton2011-12-281-2/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | AR#where with an Array of 2 elements including a nil
| * | | | | | | where(foo: [1, nil]) becomes "WHERE foo = 1 OR foo IS NULL"Akira Matsuda2011-12-281-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | was "WHERE foo IN (1) OR foo IS NULL" before
| * | | | | | | no need to compact an already compacted ArrayAkira Matsuda2011-12-281-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #4153 from ↵Jon Leighton2011-12-283-25/+81
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | alexeymuranov/my_fix_for_prefix_suffix_fixtures_test Fix a fixtures test case with table prefix/suffix
| * | | | | | | Use the correct table name from fixtureAlexey Muranov2011-12-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed a bug in fixtures.rb where the table name was incorrectly inferred from the fixture path which was ambiguously called "table_name" but was also used as the fixture name. Now, the "correct" table name is taken from an instance variable.