aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* threads can wait on responses to be committedAaron Patterson2012-07-273-1/+34
|
* Revert "Removing composed_of from ActiveRecord."Rafael Mendonça França2012-07-2719-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_7178Rafael Mendonça França2012-07-271-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 Honda2012-07-281-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/rbxRafael Mendonça França2012-07-271-5/+1
|\ \ | |/ |/| Don't test language-level exception messages
| * Don't test language-level exception messagesJohn Firebaugh2012-07-271-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/masterJosé Valim2012-07-275-0/+118
|\ | | | | Validates_presence_of associated object marked for destruction
| * AR has a subclass of AM:PresenceValidator.Brent Wheeldon & Nick Monje2012-07-205-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 behaviorDavid Heinemeier Hansson2012-07-273-2/+40
| |
* | will now return nil instead of raise a NoMethodError if the receiving ↵David Heinemeier Hansson2012-07-273-5/+10
| | | | | | | | object does not implement the method
* | Changelog and doc updates for the previous changes.Jon Leighton2012-07-273-24/+27
| |
* | Deprecate Relation#all.Jon Leighton2012-07-276-22/+9
| | | | | | | | | | | | It has been moved to active_record_deprecated_finders. Use #to_a instead.
* | Deprecate ActiveRecord::Base.scoped.Jon Leighton2012-07-2742-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 Leighton2012-07-2731-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ça2012-07-271-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_7138Rafael Mendonça França2012-07-261-1/+1
|\ \ | | | | | | Modify the preference attribute from `:null => false` to `:null => true`
| * | Modify the preference attribute from `:null => false` to `:null => true`Yasuo Honda2012-07-271-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-3424Aaron Patterson2012-07-261-2/+2
| | | | | | | | | | Conflicts: actionpack/lib/action_controller/metal/http_authentication.rb
* | Merge pull request #7171 from beerlington/refactor_inheritance_base_classRafael Mendonça França2012-07-263-30/+45
|\ \ | | | | | | Refactor ActiveRecord::Inheritance.base_class logic
| * | Refactor ActiveRecord::Inheritance.base_class logicbeerlington2012-07-263-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/masterRafael Mendonça França2012-07-262-2/+2
|\ \ \ | |/ / |/| | Fix typo in documentation
| * | fix typo in documentationAnatoly Makarevich2012-07-262-2/+2
|/ /
* | Merge pull request #7167 from route/missed_extendJosé Valim2012-07-261-0/+1
|\ \ | | | | | | Missed extend for eager_autoload
| * | Missed extend for eager_autoloadDmitry Vorotilin2012-07-261-0/+1
|/ /
* | Merge pull request #7166 from ayrton/patch-1Jon Leighton2012-07-261-13/+13
|\ \ | | | | | | Update activerecord/CHANGELOG.md
| * | Update activerecord/CHANGELOG.mdAyrton De Craene2012-07-261-13/+13
| | | | | | | | | Fixed markdown code indenting
* | | Merge pull request #7161 from ↵Jon Leighton2012-07-261-5/+7
|\ \ \ | |/ / |/| | | | | | | | michaelfairley/eager_load_active_record_association_helpers Eager autoload ActiveRecord association helpers
| * | Eager autoload ActiveRecord association helpersMichael Fairley2012-07-251-5/+7
| | |
* | | Merge pull request #7165 from parndt/patch-5Rafael Mendonça França2012-07-251-1/+1
|\ \ \ | | | | | | | | Switched update_column recommendation in changelog to update_columns
| * | | Switched update_column recommendation in changelog to update_columnsPhilip Arndt2012-07-261-1/+1
|/ / / | | | | | | | | | | | | Related to #7164 Looks like the last one; thanks!
* | | Merge pull request #6654 from stevecj/postgresql-auto-reconnect-2Aaron Patterson2012-07-253-1/+76
|\ \ \ | | | | | | | | Postgresql auto reconnect 2
| * | | Stop being silly with formatting of method aliasing.Steve Jorgensen2012-07-161-3/+3
| | | |
| * | | Simulated & actual (manual/skipped) PostgreSQL auto-reconnection tests.Steve Jorgensen2012-07-163-0/+75
| | | |
| * | | Don't crash exception translation w/ nil result attribute.Steve Jorgensen2012-07-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Exception.result is nil when attempting a query after PostgreSQL disconnect, resulting in new exception: NoMethodError: undefined method `error_field' for nil:NilClass
* | | | Merge pull request #7158 from yahonda/use_string_for_settingsRafael Mendonça França2012-07-251-1/+1
|\ \ \ \ | | | | | | | | | | Use string datatype for the setting attribute
| * | | | Use string datatype for the setting attributeYasuo Honda2012-07-261-1/+1
|/ / / / | | | | | | | | | | | | to make store works all database adapters.
* | | | Merge pull request #7151 from graceliu/travis-rm-dup-runCarlos Antonio da Silva2012-07-241-3/+0
|\ \ \ \ | | | | | | | | | | remove duplicate build runs in travis
| * | | | remove duplicate build runs in travis. These extra runs were used toGrace Liu2012-07-241-3/+0
|/ / / / | | | | | | | | | | | | test identity map and not fully removed when the feature was removed.
* | | | Merge branch 'update_columns'Rafael Mendonça França2012-07-2416-63/+212
|\ \ \ \
| * | | | Deprecate update_column in favor of update_columns.Rafael Mendonça França2012-07-2415-47/+85
| | | | | | | | | | | | | | | | | | | | Closes #1190
| * | | | Use update_columns to implemente the update_columnRafael Mendonça França2012-07-242-19/+54
| | | | |
| * | | | New #update_columns method.Sebastian Martinez2012-07-243-0/+76
|/ / / /
* | | | Merge pull request #7148 from yahonda/address_6195Rafael Mendonça França2012-07-241-1/+1
|\ \ \ \ | | | | | | | | | | Addresses ORA-01400 errors and also supports #6115
| * | | | This pull requests addresses ORA-01400 errors and also supports #6115 issue ↵Yasuo Honda2012-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tested. Issue #6115 has been fixed and tested with the attribute `:null => false, :default => ""` However `:null => false` attribute is not necessary to test this issue, which causes many ORA-01400 errors with Oracle enhanced adapter.
* | | | | Merge pull request #7150 from lucasmazza/flush_optionRafael Mendonça França2012-07-242-13/+13
|\ \ \ \ \ | | | | | | | | | | | | Replace the flush parameter with a Hash.
| * | | | | Replace the flush parameter with a Hash.Lucas Mazza2012-07-242-13/+13
|/ / / / /
* | | | | Merge pull request #6991 from frodsan/performance_test_generatorRafael Mendonça França2012-07-242-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | update performance test template to use test method
| * | | | update performance test template to use test methodFrancesco Rodriguez2012-07-062-2/+2
| | | | |
* | | | | Merge pull request #7143 from accessd/fix-typo-callbacks-testSantiago Pastorino2012-07-241-2/+2
|\ \ \ \ \ | | | | | | | | | | | | fix typo in validations callbacks test
| * | | | | fix typo in callbacks testAccessd2012-07-241-2/+2
|/ / / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-20 20:51:10 +0000