diff options
| author | Mark Thomson <nzl216@gmail.com> | 2012-03-13 02:37:53 -0500 |
|---|---|---|
| committer | Mark Thomson <nzl216@gmail.com> | 2012-03-13 02:37:53 -0500 |
| commit | bc8b55c5c382b6747e490c04d9d74dc8322bd23c (patch) | |
| tree | 1a1e0b4a66cf7f4b4aacc4b898356a3b4834f288 /railties/guides/source/configuring.textile | |
| parent | 4cb71eaf463bb6a12edd1aaf222e9f1e3269bea7 (diff) | |
| parent | 30b2dd431e889ba613511763152a28bab623b90e (diff) | |
| download | rails-bc8b55c5c382b6747e490c04d9d74dc8322bd23c.tar.gz rails-bc8b55c5c382b6747e490c04d9d74dc8322bd23c.tar.bz2 rails-bc8b55c5c382b6747e490c04d9d74dc8322bd23c.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'railties/guides/source/configuring.textile')
| -rw-r--r-- | railties/guides/source/configuring.textile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/railties/guides/source/configuring.textile b/railties/guides/source/configuring.textile index 0ab1076fff..7a93a30702 100644 --- a/railties/guides/source/configuring.textile +++ b/railties/guides/source/configuring.textile @@ -286,6 +286,8 @@ h4. Configuring Active Record * +config.active_record.dependent_restrict_raises+ will control the behavior when an object with a <tt>:dependent => :restrict</tt> association is deleted. Setting this to false will prevent +DeleteRestrictionError+ from being raised and instead will add an error on the model object. Defaults to false in the development mode. +* +config.active_record.mass_assignment_sanitizer+ will determine the strictness of the mass assignment sanitization within Rails. Defaults to +:strict+. In this mode, mass assigning any non-+attr_accessible+ attribute in a +create+ or +update_attributes+ call will raise an exception. Setting this option to +:logger+ will only print to the log file when an attribute is being assigned and will not raise an exception. + The MySQL adapter adds one additional configuration option: * +ActiveRecord::ConnectionAdapters::MysqlAdapter.emulate_booleans+ controls whether Active Record will consider all +tinyint(1)+ columns in a MySQL database to be booleans and is true by default. |