Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge branch 'master' of github.com:rails/rails | José Valim | 2010-06-20 | 3 | -12/+18 | |
|\ | ||||||
| * | Fix test which prevents connection reset on failing and remove hardcoded ↵ | Master Lambaster | 2010-06-18 | 1 | -8/+7 | |
| | | | | | | | | | | | | | | | | connection [#4689 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | Fix bug with rolling back frozen attributes. | Brian Durand | 2010-06-18 | 2 | -4/+11 | |
| | | | | | | | | | | | | [#2991] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
* | | ActiveRecord and ActionPack now use the new descendants implementation. | José Valim | 2010-06-19 | 1 | -4/+0 | |
|/ | ||||||
* | use assert_in_delta() for floating point comparisons in tests [#4871 ↵ | Aaron Patterson | 2010-06-16 | 1 | -1/+1 | |
| | | | | | | state:resolved] Signed-off-by: Carl Lerche <carllerche@mac.com> | |||||
* | edit pass: the names of Rails components have a space, ie, "Active Record", ↵ | Xavier Noria | 2010-06-14 | 1 | -1/+1 | |
| | | | | not "ActiveRecord" | |||||
* | Revert "Don't overwrite unsaved updates when loading an association but ↵ | José Valim | 2010-06-11 | 1 | -14/+0 | |
| | | | | | | | | preserve the order of the loaded records. [#4642 state:open]" This commit introduced a regression described in ticket [#4830]. This reverts commit 0265c708b9696c3943518ad5f3dabdc22c5eba11. | |||||
* | Validators should at model level and not at AR:Base level [Closes #4804] | Neeraj Singh | 2010-06-10 | 1 | -0/+10 | |
| | | | | | | [#4804 state:resolved] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | |||||
* | Don't overwrite unsaved updates when loading an association but preserve the ↵ | James Le Cuirot | 2010-06-09 | 1 | -0/+14 | |
| | | | | | | order of the loaded records. [#4642 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
* | Make sure about which is the first element of the query, fixes a postgresql ↵ | Santiago Pastorino | 2010-06-09 | 1 | -2/+2 | |
| | | | | | | 8.4 failing test Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | SQLite2Adapter doesn't exist | Santiago Pastorino | 2010-06-09 | 1 | -1/+1 | |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | Revert "Temporarily revert "Update after_commit and after_rollback docs and ↵ | Jeremy Kemper | 2010-06-08 | 2 | -0/+273 | |
| | | | | | | | | tests to use new style API with an :on options instead of on_* suffix." and "Add after_commit and after_rollback callbacks to ActiveRecord that are called after transactions either commit or rollback on all records saved or destroyed in the transaction."" This reverts commit 1b2941cba1165b0721f57524645fe378bee2a950. [#2991] | |||||
* | Avoid PostgreSQL and MySQL tests warnings. | Emilio Tagua | 2010-06-08 | 2 | -3/+6 | |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | Fix ActiveRecord::Base.compute_type swallowing NoMethodError. [#4751 ↵ | Andrew Bloomgarden | 2010-06-08 | 1 | -0/+17 | |
| | | | | | | state:resolved] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | |||||
* | Add parentheses to avoid warnings when running AR tests. | Emilio Tagua | 2010-06-08 | 1 | -4/+4 | |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | Temporarily revert "Update after_commit and after_rollback docs and tests to ↵ | Jeremy Kemper | 2010-06-08 | 2 | -273/+0 | |
| | | | | | | | | | | | | | | use new style API with an :on options instead of on_* suffix." and "Add after_commit and after_rollback callbacks to ActiveRecord that are called after transactions either commit or rollback on all records saved or destroyed in the transaction." This reverts commits d2a49e4b1f30c5997e169110eed94a55aee53f56 and da840d13da865331297d5287391231b1ed39721b. [#2991] Conflicts: activerecord/CHANGELOG activerecord/lib/active_record/transactions.rb activerecord/test/cases/transaction_callbacks_test.rb | |||||
* | Fix multiple self-referencing eager loads failing to join multiple times | Ernie Miller | 2010-06-08 | 1 | -1/+9 | |
| | | | | | | [#4679 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
* | Merge remote branch 'rsim/oracle_enhanced_rails3' | wycats | 2010-06-07 | 7 | -37/+34 | |
|\ | ||||||
| * | compare sorted arrays in relations_test | Raimonds Simanovskis | 2010-06-04 | 1 | -1/+1 | |
| | | | | | | Oracle does not guarantee that SELECT will return records ordered by primary key | |||||
| * | fix test_belongs_to_with_primary_key_joins_on_correct_column test on Oracle | Raimonds Simanovskis | 2010-06-04 | 1 | -0/+4 | |
| | | ||||||
| * | Fixed adapter tests not to assert LIMIT and OFFSET in SQL strings | Raimonds Simanovskis | 2010-06-04 | 1 | -13/+4 | |
| | | | | | | | | Fixed adapter test cases that were failing in oracle because the asserts were looking for the presence of offset and limit which are not available in oracle. Changed the tests to check that the sql injection is not present in the output so that the tests are database adapter agnostic. | |||||
| * | assert log output match in case insensitive mode to avoid failure when ↵ | Raimonds Simanovskis | 2010-06-04 | 1 | -2/+2 | |
| | | | | | | | | quoted table name is in uppercase (when using Oracle) | |||||
| * | test fixes for Oracle enhanced adapter: | Raimonds Simanovskis | 2010-06-04 | 1 | -2/+2 | |
| | | | | | | | | | | latest oracle_enhanced adapter does automatic shortening of index names ignore select from all_triggers table in assert_queries | |||||
| * | do order by id when finding first fixture to ensure that it is correct one | Raimonds Simanovskis | 2010-06-04 | 1 | -1/+1 | |
| | | | | | | | | (as otherwise was failing under JRuby and oracle_enhanced adapter) | |||||
| * | Oracle enhanced adapter now supports shortening of default generated index ↵ | Raimonds Simanovskis | 2010-06-04 | 1 | -12/+10 | |
| | | | | | | | | names, some additional tests now pass | |||||
| * | Reduced size of table name prefix and suffix in migrations test as in Oracle ↵ | Raimonds Simanovskis | 2010-06-04 | 1 | -3/+4 | |
| | | | | | | | | identifier name cannot be larger than 30 characters | |||||
| * | Explicitly set Topic model last_read attribute as Date value when Oracle ↵ | Raimonds Simanovskis | 2010-06-04 | 1 | -3/+4 | |
| | | | | | | | | | | | | enhanced adapter is used (otherwise some tests are failing which assume that this attribute will have Date value) | |||||
| * | create DateTime value with local offset as later it is compared to Time ↵ | Raimonds Simanovskis | 2010-06-04 | 1 | -1/+3 | |
| | | | | | | | | | | | | value with local offset (otherwise test is failing for oracle_enhanced JDBC adapter) | |||||
* | | This test shouldn't rely on the order of the data returned by select | Santiago Pastorino | 2010-06-07 | 1 | -1/+1 | |
| | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
* | | Really make include_root_in_json default to true [#3770 state:resolved] | José Valim | 2010-06-08 | 1 | -11/+8 | |
| | | ||||||
* | | Fixing test class names and refactor line in autosave association | Carlos Antonio da Silva | 2010-06-07 | 2 | -6/+6 | |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | | removes Array#random_element and backports Array#sample from Ruby 1.9, ↵ | Xavier Noria | 2010-06-05 | 2 | -8/+8 | |
|/ | | | | thanks to Marc-Andre Lafortune | |||||
* | Properly cache association_collection#scopes calls having arguments | Pratik Naik | 2010-06-04 | 1 | -0/+13 | |
| | ||||||
* | Special treatement for Relation#select { with block } | Pratik Naik | 2010-06-02 | 1 | -0/+5 | |
| | ||||||
* | Merge commit 'mislav/counter_cache' | Michael Koziarski | 2010-05-29 | 2 | -49/+83 | |
|\ | ||||||
| * | fix `reset_counters` to work even with complex class names | Mislav Marohnić | 2010-05-24 | 1 | -0/+25 | |
| | | | | | | | | | | | | 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 refactor | Mislav Marohnić | 2010-05-24 | 2 | -49/+58 | |
| | | ||||||
* | | Refactor calculation test to remove unneeded SQLite special case. | Santiago Pastorino | 2010-05-24 | 1 | -4/+1 | |
|/ | | | | | | [#4633] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
* | Fix failing test. | José Valim | 2010-05-21 | 1 | -6/+6 | |
| | ||||||
* | Replace assert with assert_equal in some test cases | Neeraj Singh | 2010-05-21 | 1 | -2/+2 | |
| | | | | | | [#4654 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | Final iteration of use better testing methods | Neeraj Singh | 2010-05-19 | 9 | -25/+25 | |
| | | | | | | [#4652 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | Fixes a test on transaction_callbacks_test.rb | Santiago Pastorino | 2010-05-19 | 1 | -2/+2 | |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | Use better assertion methods for testing | Neeraj Singh | 2010-05-19 | 16 | -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 Kemper | 2010-05-18 | 1 | -12/+0 | |
| | | | | | | | | | | | | | | 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-18 | 3 | -2/+41 | |
| | | | | | | | | track database limits [#3452 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
* | Fixes transaction callbacks tests | Santiago Pastorino | 2010-05-18 | 1 | -23/+19 | |
| | | | | | | [#4640 state:committed] Signed-off-by: wycats <wycats@gmail.com> | |||||
* | Nested records (re: autosave) are now updated even when the intermediate ↵ | Ian White | 2010-05-18 | 1 | -0/+80 | |
| | | | | | | parent record is unchanged [#4242 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | assert_equal should be used instead of assert | Neeraj Singh | 2010-05-18 | 1 | -1/+1 | |
| | | | | | | [#4629 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | expected value should come first in assert_equal | Neeraj Singh | 2010-05-18 | 1 | -3/+3 | |
| | | | | | | [#4630 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | Remove Model.clear_default_scope | Pratik Naik | 2010-05-18 | 1 | -12/+0 | |
| |