aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge commit 'mislav/counter_cache'Michael Koziarski2010-05-293-63/+95
|\
| * fix `reset_counters` to work even with complex class namesMislav Marohnić2010-05-242-4/+31
| | | | | | | | | | | | e.g. it guesses that a belongs_to association to Namespace::MyModel is named "my_model", unlike before where it would look up an association named "namespace::mymodel" and fail.
| * move counter_cache tests to a separate file and refactorMislav Marohnić2010-05-242-49/+58
| |
| * cleanup `update/reset_counters`: less SQL strings, more ActiveRecord/ArelMislav Marohnić2010-05-241-12/+8
| |
* | Refactor calculation test to remove unneeded SQLite special case.Santiago Pastorino2010-05-241-4/+1
|/ | | | | | [#4633] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Fix failing test.José Valim2010-05-212-9/+9
|
* Replace assert with assert_equal in some test casesNeeraj Singh2010-05-211-2/+2
| | | | | | [#4654 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* refactor evals and adds some __FILE__ and __LINE__Santiago Pastorino2010-05-203-4/+4
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Merge remote branch 'rails/master'Xavier Noria2010-05-1942-214/+466
|\
| * Final iteration of use better testing methodsNeeraj Singh2010-05-199-25/+25
| | | | | | | | | | | | [#4652 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Fixes a test on transaction_callbacks_test.rbSantiago Pastorino2010-05-191-2/+2
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * Use better assertion methods for testingNeeraj Singh2010-05-1916-89/+82
| | | | | | | | | | | | [#4645 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Revert "Don't carry default value when changing column for a binary type on ↵Jeremy Kemper2010-05-182-17/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | MySQL" Broke mysql tests. This reverts commit edec1afe25014749f0e2df86d27477b45586a9e3. Conflicts: activerecord/test/cases/migration_test.rb [#3234 state:open]
| * make add_index and remove_index more resilient; new rename_index method; ↵Étienne Barrié2010-05-188-13/+147
| | | | | | | | | | | | | | | | track database limits [#3452 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Fixes transaction callbacks testsSantiago Pastorino2010-05-181-23/+19
| | | | | | | | | | | | [#4640 state:committed] Signed-off-by: wycats <wycats@gmail.com>
| * Nested records (re: autosave) are now updated even when the intermediate ↵Ian White2010-05-184-2/+106
| | | | | | | | | | | | parent record is unchanged [#4242 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * assert_equal should be used instead of assertNeeraj Singh2010-05-181-1/+1
| | | | | | | | | | | | [#4629 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * expected value should come first in assert_equalNeeraj Singh2010-05-181-3/+3
| | | | | | | | | | | | [#4630 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Remove Model.clear_default_scopePratik Naik2010-05-182-16/+0
| |
| * Cut the fat and make session stores rely on request.cookie_jar and change ↵José Valim2010-05-181-1/+1
| | | | | | | | set_session semantics to return the cookie value instead of a boolean.
| * Use assert_equal correctly in transaction callback tests (exposing some of ↵Paco Guzman2010-05-171-17/+17
| | | | | | | | | | | | | | | | them as broken) [#4612] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * AR::Base#clone fixed to set dirty bits for cloned objectpleax2010-05-162-1/+57
| | | | | | | | | | | | [#2919 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * cache connection when quotingComron Sattari2010-05-161-5/+6
| | | | | | | | | | | | | | [#3642 state:committed] Signed-off-by: Marius Nuennerich <marius@nuenneri.ch> Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | Merge branch 'master' of git://github.com/rails/railsRizwan Reza2010-05-1734-110/+285
|\|
| * a cloned object no longer mimics changed flags from creator , plus a test ↵Federico Brubacher2010-05-162-0/+10
| | | | | | | | | | | | case [#4614 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Change on Array extension from rand => random_element [#4555 state:committed]Santiago Pastorino2010-05-162-8/+8
| | | | | | | | Signed-off-by: Xavier Noria <fxn@hashref.com>
| * prevent to run fixture accessor (e.g. test_foos for TestFoo model) as a test ↵Nobuhiro IMAI2010-05-162-0/+6
| | | | | | | | | | | | | | case [#2992 state:resolved] Signed-off-by: Wijnand Wiersma <wijnand@videre.net> Signed-off-by: José Valim <jose.valim@gmail.com>
| * Make use of assert_equal to test equallity between object assert expects and ↵Santiago Pastorino2010-05-163-5/+5
| | | | | | | | | | | | | | | | object and a message of error [#4611 state:committed] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Postgresql doesn't allow to change a string type column to a binary type. ↵Wijnand Wiersma2010-05-161-7/+9
| | | | | | | | | | | | Skip this test for postgresql for now. [#4616 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Don't carry default value when changing column for a binary type on MySQL ↵Elomar França2010-05-162-1/+15
| | | | | | | | | | | | [#3234 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Revert "Make ActiveModel::Errors#add_on_blank and #add_on_empty accept an ↵José Valim2010-05-154-12/+12
| | | | | | | | | | | | | | | | options hash and make various Validators pass their (filtered) options." Having a huge array to whitelist options is not the proper way to handle this case. This means that the ActiveModel::Errors object should know about the options given in *all* validators and break the extensibility added by the validators itself. If the intent is to whitelist options before sending them to I18n, each validator should clean its respective options instead of throwing the responsibility to the Errors object. This reverts commit bc1c8d58ec45593acba614d1d0fecb49adef08ff.
| * Make ActiveModel::Errors#add_on_blank and #add_on_empty accept an options ↵Jeroen van Dijk2010-05-154-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hash and make various Validators pass their (filtered) options. This makes it possible to pass additional options through Validators to message generation. E.g. plugin authors want to add validates_presence_of :foo, :format => "some format". Also, cleanup the :default vs :message options confusion in ActiveModel validation message generation. Also, deprecate ActiveModel::Errors#add_on_blank(attributes, custom_message) in favor of ActiveModel::Errors#add_on_blank(attributes, options). Original patch by Sven Fuchs, some minor changes and has been changed to be applicable to master again [#4057 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Reset quoted_table_name after set_table_name [#4568 state:resolved]Santiago Pastorino2010-05-152-1/+13
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Fix for get_ids when including a belongs_to association on a has_many ↵Diego Algorta2010-05-153-1/+6
| | | | | | | | | | | | association [#2896 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Reorganized initializers a bit to enable better hooks for common cases ↵wycats2010-05-151-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | without the need for Railtie. Specifically, the following hooks were added: * before_configuration: this hook is run immediately after the Application class comes into existence, but before the user has added any configuration. This is the appropriate place to set configuration for your plugin * before_initialize: This is run after all of the user's configuration has completed, but before any initializers have begun (in other words, it runs right after config/environments/{development,production,test}.rb) * after_initialize: This is run after all of the initializers have run. It is an appropriate place for forking in a preforking setup Each of these hooks may be used via ActiveSupport.on_load(name) { }. In all these cases, the context inside the block will be the Application object. This means that for simple cases, you can use these hooks without needing to create a Railtie.
| * STI should not ignore type condition while applying scopes from parent class ↵Neeraj Singh2010-05-152-5/+6
| | | | | | | | | | | | | | | | scopes [#4507 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Modified default_scope to merge with any pre-existing default_scopeDavid Chelimsky + Brian Tatnall2010-05-152-3/+34
| | | | | | | | | | | | | | | | | | | | | | | | and added AR::Base::clear_default_scope - clear_default_scope provides users who rely on the old behaviour of each call to default_scope overwriting any previous default scopes an opportunity to maintain that behaviour. [#4583 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Better code formatting and proper line numbers for stack tracesNeeraj Singh2010-05-142-17/+17
| | | | | | | | | | | | [#4596 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * To allow proper fisting of stack traceSantiago Pastorino2010-05-141-3/+3
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * revises the rdoc of #average according to 5f3bd55, and realigns when clausesXavier Noria2010-05-121-5/+4
| |
| * type_cast_calculated_value refactor: value is never a Fixnum here. Fix test ↵Santiago Pastorino2010-05-112-3/+2
| | | | | | | | | | | | | | | | since SQLite returns Float. [#4514 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Make sure timestamp is properly referencedBlake Smith2010-05-111-1/+1
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * Remove undocumented save_without_validation!Pratik Naik2010-05-112-10/+0
| |
| * Use arel instead of sql stringsPratik Naik2010-05-111-6/+5
| |
| * Succint save definitionPratik Naik2010-05-111-4/+2
| |
| * Make sure valid? preceives the context as in ActiveModel API (ht: Carlos ↵José Valim2010-05-104-26/+45
| | | | | | | | Antonio)
| * Make sure schema dumper doesnt throw up when there are no index lengthsPratik Naik2010-05-091-1/+3
| |
| * Revert "Revert "Add index length support for MySQL [#1852 state:open]""Pratik Naik2010-05-097-3/+73
| | | | | | | | This reverts commit 6626833db13a69786f9f6cd56b9f53c4017c3e39.
| * Improve code from 231d7676f72947bae765b9bd885b134aaf949921Pratik Naik2010-05-091-7/+5
| |
| * corrected AR find_each and find_in_batches to raise when the user uses ↵Josh Kalderimis2010-05-092-1/+22
| | | | | | | | | | | | select but does not specify the primary key Signed-off-by: José Valim <jose.valim@gmail.com>