Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Don't overwrite unsaved updates when loading an association but preserve the ↵ | James Le Cuirot | 2010-06-20 | 3 | -3/+28 |
| | | | | | | | | order of the loaded records. Reapplied from before but now allows already-saved records to be refreshed. [#4830 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Merge branch 'master' of github.com:rails/rails | José Valim | 2010-06-20 | 5 | -14/+21 |
|\ | |||||
| * | 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 | 4 | -6/+14 |
| | | | | | | | | | | | | [#2991] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | | ActiveModel::Validations::Callbacks should not be required by default. | José Valim | 2010-06-19 | 2 | -9/+2 |
| | | |||||
* | | moving before_validation and after_validation functionality from ↵ | Neeraj Singh | 2010-06-19 | 3 | -22/+6 |
| | | | | | | | | | | | | | | | | ActiveRecord to ActiveModel [#4653 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | Clear DescendantsTracker on each request. | José Valim | 2010-06-19 | 1 | -1/+0 |
| | | |||||
* | | ActiveRecord and ActionPack now use the new descendants implementation. | José Valim | 2010-06-19 | 4 | -38/+7 |
|/ | |||||
* | setting the timezone in postgres to whatever ruby thinks the timezone is ↵ | Aaron Patterson | 2010-06-17 | 2 | -1/+11 |
| | | | | | | [#4895 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | documents how to run an individual test in AR | Xavier Noria | 2010-06-17 | 1 | -0/+2 |
| | |||||
* | pdoc tasks publishe APIs in api.rubyonrails.org | Xavier Noria | 2010-06-16 | 1 | -1/+1 |
| | |||||
* | use RDoc 2.2 to generate the documentation of individual components | Xavier Noria | 2010-06-16 | 1 | -1/+2 |
| | |||||
* | 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> | ||||
* | Merge remote branch 'rails/master' | Xavier Noria | 2010-06-14 | 1 | -18/+21 |
|\ | |||||
| * | refactors AR::Base#reset_table_name | Xavier Noria | 2010-06-14 | 1 | -19/+20 |
| | | |||||
| * | Documentation for #quoted_table_name method | Thiago Pradi | 2010-06-14 | 1 | -0/+2 |
| | | | | | | | | Signed-off-by: Xavier Noria <fxn@hashref.com> | ||||
* | | edit pass: the names of Rails components have a space, ie, "Active Record", ↵ | Xavier Noria | 2010-06-14 | 8 | -22/+22 |
|/ | | | | not "ActiveRecord" | ||||
* | Revert "Revert "Validators should at model level and not at AR:Base level ↵ | wycats | 2010-06-12 | 1 | -0/+10 |
| | | | | | | [Closes #4804]"" This reverts commit d67549306567b219089f2355fe432d31d0ebf8a1. | ||||
* | Revert "Validators should at model level and not at AR:Base level [Closes ↵ | wycats | 2010-06-12 | 1 | -10/+0 |
| | | | | | | #4804]" This reverts commit e11bb95d56ed77b10d54d9dfe5a3cc4aa48b3a61. | ||||
* | Use load_paths on AR benchmarks so it uses the bundler setup instead of ↵ | José Valim | 2010-06-12 | 1 | -5/+5 |
| | | | | system gems. | ||||
* | Remove an unused method | Pratik Naik | 2010-06-12 | 1 | -13/+0 |
| | |||||
* | Revert "Don't overwrite unsaved updates when loading an association but ↵ | José Valim | 2010-06-11 | 3 | -17/+3 |
| | | | | | | | | preserve the order of the loaded records. [#4642 state:open]" This commit introduced a regression described in ticket [#4830]. This reverts commit 0265c708b9696c3943518ad5f3dabdc22c5eba11. | ||||
* | class_attribute is not a direct replacement of class_inheritable_*. | José Valim | 2010-06-10 | 1 | -2/+6 |
| | | | | | | If you are setting a hash or an array in class_attribute or you need to freeze it, to ensure people won't modify it in place or you need to dup it on inheritance. | ||||
* | 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> | ||||
* | Cut down even further on rake -T noise | David Heinemeier Hansson | 2010-06-09 | 1 | -13/+13 |
| | |||||
* | Silence even more noisy rake task docs | David Heinemeier Hansson | 2010-06-09 | 1 | -12/+12 |
| | |||||
* | Don't overwrite unsaved updates when loading an association but preserve the ↵ | James Le Cuirot | 2010-06-09 | 3 | -3/+17 |
| | | | | | | 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> | ||||
* | Make logic for after_commit and after_rollback :on option work like it does ↵ | Brian Durand | 2010-06-08 | 1 | -18/+33 |
| | | | | | | | | for validation callbacks. [#2991 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Revert "Temporarily revert "Update after_commit and after_rollback docs and ↵ | Jeremy Kemper | 2010-06-08 | 5 | -9/+440 |
| | | | | | | | | 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] | ||||
* | Clarify Fixture#key_ and value_list | Jeremy Kemper | 2010-06-08 | 1 | -7/+5 |
| | |||||
* | Merge remote branch 'docrails/master' | Xavier Noria | 2010-06-08 | 1 | -1/+1 |
|\ | |||||
| * | Merge remote branch 'rails/master' | Xavier Noria | 2010-06-08 | 22 | -499/+84 |
| |\ | |||||
| * | | update docs before_validation_on_create => before_validation(:on => :create) | Santiago Pastorino and José Ignacio Costa | 2010-06-07 | 1 | -1/+1 |
| | | | |||||
* | | | 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 | 3 | -1/+22 |
| |/ |/| | | | | | | | | | 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> | ||||
* | | Bump Arel to 0.4.0 | Emilio Tagua | 2010-06-08 | 1 | -1/+1 |
| | | | | | | | | 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 | 5 | -440/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | Get ready for beta 4 | David Heinemeier Hansson | 2010-06-08 | 2 | -2/+2 |
| | | |||||
* | | forcing encoding on 1.9 when dealing with "binary" columns [#4612 ↵ | Aaron Patterson | 2010-06-08 | 1 | -0/+4 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: wycats <wycats@gmail.com> | ||||
* | | Fix multiple self-referencing eager loads failing to join multiple times | Ernie Miller | 2010-06-08 | 2 | -3/+11 |
| | | | | | | | | | | | | [#4679 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | | Merge remote branch 'rsim/oracle_enhanced_rails3' | wycats | 2010-06-07 | 11 | -41/+48 |
|\ \ | |||||
| * | | 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 | ||||
| * | | ignore raw_sql_ table alias that is used by Oracle adapter | Raimonds Simanovskis | 2010-06-04 | 1 | -1/+2 |
| | | | |||||
| * | | fix test_belongs_to_with_primary_key_joins_on_correct_column test on Oracle | Raimonds Simanovskis | 2010-06-04 | 1 | -0/+4 |
| | | | |||||
| * | | Downcase quoted table name in regex in count_aliases_from_table_joins | Raimonds Simanovskis | 2010-06-04 | 1 | -1/+2 |
| | | | | | | | | | | | | Oracle adapter's quote_table_name returns quoted table name in uppercase and therefore it should be downcased before scanning downcased join_sql | ||||
| * | | 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. | ||||
| * | | ignore selects from data dictionary views when running tests on Oracle | Raimonds Simanovskis | 2010-06-04 | 1 | -1/+1 |
| | | |