Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge pull request #7196 from ↵ | Aaron Patterson | 2012-07-29 | 1 | -1/+5 | |
|\ | | | | | | | | | rimidl/fix-incorrect-require-mysql-in-mysql_rake_test Fix incorrect usage `require mysql` in the activerecord/.../mysql_rake_test | |||||
| * | fix incorrect usage `require mysql` in the ↵ | Vladimir Strakhov | 2012-07-29 | 1 | -1/+5 | |
| | | | | | | | | activerecord/test/.../mysql_rake_test.rb | |||||
* | | Merge pull request #7188 from rodrigoflores/master | Carlos Antonio da Silva | 2012-07-29 | 1 | -1/+2 | |
|\ \ | | | | | | | Documentation Fix: Pointing the case when no dependent option is given to a association method | |||||
| * | | Explaining a bit better about the default behaviour of dependent | Rodrigo Flores | 2012-07-28 | 1 | -1/+2 | |
| | | | ||||||
* | | | Merge pull request #7192 from bogdan/sqlite_tests_fix | Carlos Antonio da Silva | 2012-07-29 | 1 | -4/+4 | |
|\ \ \ | | | | | | | | | More polite cleanup for sqlite tests | |||||
| * | | | More polite cleanup for sqlite tests | Bogdan Gusiev | 2012-07-29 | 1 | -4/+4 | |
| | |/ | |/| | ||||||
* | | | Merge pull request #7194 from alexandrz/master | Carlos Antonio da Silva | 2012-07-29 | 1 | -6/+3 | |
|\ \ \ | |/ / |/| | | DRY class_attribute | |||||
| * | | DRY class_attribute code | Aleksandr Zykov | 2012-07-29 | 1 | -6/+3 | |
|/ / | ||||||
* | | issue a warning when we cannot construct a controller | Aaron Patterson | 2012-07-28 | 1 | -2/+10 | |
| | | ||||||
* | | this test is not a controller test, so switch to AS::TC | Aaron Patterson | 2012-07-28 | 1 | -1/+1 | |
|/ | ||||||
* | removes the AR session store from eager loaded code [fixes #7160] | Xavier Noria | 2012-07-29 | 1 | -1/+10 | |
| | | | | | See the comment in the file activerecord/lib/active_record.rb added by this patch for the rationale. | |||||
* | Merge pull request #7186 from rimidl/fix-failure-test-in-actionpack | Rafael Mendonça França | 2012-07-28 | 1 | -2/+2 | |
|\ | | | | | Fix test_can_wait_until_commit(ResponseTest) in /actionpack/test/dispatch/response_test.rb | |||||
| * | fix failure test 'test_can_wait_until_commit(ResponseTest)' in actionpack | Vladimir Strakhov | 2012-07-28 | 1 | -2/+2 | |
| | | ||||||
* | | Merge pull request #7185 from route/reset_table_name_refactoring | Rafael Mendonça França | 2012-07-28 | 1 | -8/+4 | |
|\ \ | |/ |/| | Refactor to reset_table_name | |||||
| * | Refactor to reset_table_name | Dmitry Vorotilin | 2012-07-28 | 1 | -8/+4 | |
| | | ||||||
* | | missing require: the AR session store depends on the AP abstract store | Xavier Noria | 2012-07-28 | 1 | -0/+2 | |
|/ | | | | | | | | This require makes the dependency even more clear. In particular we are eager loading the session store but that does not work if AR is used outside Rails, this patch is preliminary work in fixing #7160. | |||||
* | adds a missing require from Active Support | Xavier Noria | 2012-07-28 | 1 | -0/+1 | |
| | | | | This file uses mattr_accessor. | |||||
* | threads can wait on responses to be committed | Aaron Patterson | 2012-07-27 | 3 | -1/+34 | |
| | ||||||
* | Revert "Removing composed_of from ActiveRecord." | Rafael Mendonça França | 2012-07-27 | 19 | -32/+790 | |
| | | | | | | | | | | | This reverts commit 14fc8b34521f8354a17e50cd11fa3f809e423592. Reason: we need to discuss a better path from this removal. Conflicts: activerecord/lib/active_record/reflection.rb activerecord/test/cases/base_test.rb activerecord/test/models/developer.rb | |||||
* | Merge pull request #7182 from yahonda/address_7178 | Rafael Mendonça França | 2012-07-27 | 1 | -1/+1 | |
|\ | | | | | Modity the :json_data_empty attribute from `:null => false` to `:null => true` | |||||
| * | Modity the :json_data_empty attribute from `:null => false` to `:null => true` | Yasuo Honda | 2012-07-28 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | to address ORA-01400 errors with Oracle enhanced adapter. The original commit 3c0bf043 requires :json_data_empty attribute has empty string OR null, then setting `:default => ""` is enough. | |||||
* | | Merge pull request #7181 from jfirebaugh/rbx | Rafael Mendonça França | 2012-07-27 | 1 | -5/+1 | |
|\ \ | |/ |/| | Don't test language-level exception messages | |||||
| * | Don't test language-level exception messages | John Firebaugh | 2012-07-27 | 1 | -5/+1 | |
|/ | | | | | | Ruby implementations should be free to produce exception messages that are not identical to MRI. For example, Rubinius produces 'Expected an even number, got 5'. | |||||
* | Merge pull request #6827 from zephyr-dev/master | José Valim | 2012-07-27 | 5 | -0/+118 | |
|\ | | | | | Validates_presence_of associated object marked for destruction | |||||
| * | AR has a subclass of AM:PresenceValidator. | Brent Wheeldon & Nick Monje | 2012-07-20 | 5 | -0/+118 | |
| | | | | | | | | | | | | | | This allows us to mark the parent object as invalid if all associated objects in a presence validated association are marked for destruction. See: https://github.com/rails/rails/issues/6812 | |||||
* | | Add Object#try! with the old NoMethodError raising behavior | David Heinemeier Hansson | 2012-07-27 | 3 | -2/+40 | |
| | | ||||||
* | | will now return nil instead of raise a NoMethodError if the receiving ↵ | David Heinemeier Hansson | 2012-07-27 | 3 | -5/+10 | |
| | | | | | | | | object does not implement the method | |||||
* | | Changelog and doc updates for the previous changes. | Jon Leighton | 2012-07-27 | 3 | -24/+27 | |
| | | ||||||
* | | Deprecate Relation#all. | Jon Leighton | 2012-07-27 | 6 | -22/+9 | |
| | | | | | | | | | | | | It has been moved to active_record_deprecated_finders. Use #to_a instead. | |||||
* | | Deprecate ActiveRecord::Base.scoped. | Jon Leighton | 2012-07-27 | 42 | -504/+497 | |
| | | | | | | | | | | | | | | It doesn't serve much purpose now that ActiveRecord::Base.all returns a Relation. The code is moved to active_record_deprecated_finders. | |||||
* | | ActiveRecord::Base.all returns a Relation. | Jon Leighton | 2012-07-27 | 31 | -324/+329 | |
| | | | | | | | | | | | | | | | | | | | | | | Previously it returned an Array. If you want an array, call e.g. `Post.to_a` rather than `Post.all`. This is more explicit. In most cases this should not break existing code, since Relations use method_missing to delegate unknown methods to #to_a anyway. | |||||
* | | Only require the `:rails_env` task where is needed. | Rafael Mendonça França | 2012-07-27 | 1 | -12/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | `:rails_env` tasks is not needed in all the tasks that depends of `load_config`, only in the tasks that uses `Rails.env`. Since `:rails_env` task set the `Rails.env` to be "development" if it is not set we don't need the `||` statements too Fix #7175. Conflicts: activerecord/lib/active_record/railties/databases.rake | |||||
* | | Merge pull request #7173 from yahonda/address_7138 | Rafael Mendonça França | 2012-07-26 | 1 | -1/+1 | |
|\ \ | | | | | | | Modify the preference attribute from `:null => false` to `:null => true` | |||||
| * | | Modify the preference attribute from `:null => false` to `:null => true` | Yasuo Honda | 2012-07-27 | 1 | -1/+1 | |
|/ / | | | | | | | | | | | | | | | to address ORA-01400 errors with Oracle enhanced adapter. Issue #4856 had been fixed and tested with the attribute `:null => false, :default => ""`. Now `:null => false` attribute is not necessary to test this issue. | |||||
* | | * Do not convert digest auth strings to symbols. CVE-2012-3424 | Aaron Patterson | 2012-07-26 | 1 | -2/+2 | |
| | | | | | | | | | | Conflicts: actionpack/lib/action_controller/metal/http_authentication.rb | |||||
* | | Merge pull request #7171 from beerlington/refactor_inheritance_base_class | Rafael Mendonça França | 2012-07-26 | 3 | -30/+45 | |
|\ \ | | | | | | | Refactor ActiveRecord::Inheritance.base_class logic | |||||
| * | | Refactor ActiveRecord::Inheritance.base_class logic | beerlington | 2012-07-26 | 3 | -30/+45 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved logic from class_of_active_record_descendant(class) to the base_class method. This method was confusing because it required an argument, but that argument was 'self'. Moved base_class tests to inheritance_test.rb and added some test coverage for some untested cases. | |||||
* | | | Merge pull request #7170 from makaroni4/master | Rafael Mendonça França | 2012-07-26 | 2 | -2/+2 | |
|\ \ \ | |/ / |/| | | Fix typo in documentation | |||||
| * | | fix typo in documentation | Anatoly Makarevich | 2012-07-26 | 2 | -2/+2 | |
|/ / | ||||||
* | | Merge pull request #7167 from route/missed_extend | José Valim | 2012-07-26 | 1 | -0/+1 | |
|\ \ | | | | | | | Missed extend for eager_autoload | |||||
| * | | Missed extend for eager_autoload | Dmitry Vorotilin | 2012-07-26 | 1 | -0/+1 | |
|/ / | ||||||
* | | Merge pull request #7166 from ayrton/patch-1 | Jon Leighton | 2012-07-26 | 1 | -13/+13 | |
|\ \ | | | | | | | Update activerecord/CHANGELOG.md | |||||
| * | | Update activerecord/CHANGELOG.md | Ayrton De Craene | 2012-07-26 | 1 | -13/+13 | |
| | | | | | | | | | Fixed markdown code indenting | |||||
* | | | Merge pull request #7161 from ↵ | Jon Leighton | 2012-07-26 | 1 | -5/+7 | |
|\ \ \ | |/ / |/| | | | | | | | | michaelfairley/eager_load_active_record_association_helpers Eager autoload ActiveRecord association helpers | |||||
| * | | Eager autoload ActiveRecord association helpers | Michael Fairley | 2012-07-25 | 1 | -5/+7 | |
| | | | ||||||
* | | | Merge pull request #7165 from parndt/patch-5 | Rafael Mendonça França | 2012-07-25 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Switched update_column recommendation in changelog to update_columns | |||||
| * | | | Switched update_column recommendation in changelog to update_columns | Philip Arndt | 2012-07-26 | 1 | -1/+1 | |
|/ / / | | | | | | | | | | | | | Related to #7164 Looks like the last one; thanks! | |||||
* | | | Merge pull request #6654 from stevecj/postgresql-auto-reconnect-2 | Aaron Patterson | 2012-07-25 | 3 | -1/+76 | |
|\ \ \ | | | | | | | | | Postgresql auto reconnect 2 | |||||
| * | | | Stop being silly with formatting of method aliasing. | Steve Jorgensen | 2012-07-16 | 1 | -3/+3 | |
| | | | | ||||||
| * | | | Simulated & actual (manual/skipped) PostgreSQL auto-reconnection tests. | Steve Jorgensen | 2012-07-16 | 3 | -0/+75 | |
| | | | |