aboutsummaryrefslogtreecommitdiffstats
path: root/railties/guides/source/configuring.textile
diff options
context:
space:
mode:
authorMatt Burke <spraints@gmail.com>2011-11-18 14:10:17 -0500
committerMatt Burke <spraints@gmail.com>2011-11-18 14:10:17 -0500
commited5586fa9e2f585d2edeb600ab1c884e419f9f72 (patch)
treeda02c2d292ce5648bb867dc23001e9d1c1de0b87 /railties/guides/source/configuring.textile
parent48b580a03b84a277123b656efee91613f7503479 (diff)
downloadrails-ed5586fa9e2f585d2edeb600ab1c884e419f9f72.tar.gz
rails-ed5586fa9e2f585d2edeb600ab1c884e419f9f72.tar.bz2
rails-ed5586fa9e2f585d2edeb600ab1c884e419f9f72.zip
Add config.active_record.identity_map to the configuration guide.
Diffstat (limited to 'railties/guides/source/configuring.textile')
-rw-r--r--railties/guides/source/configuring.textile2
1 files changed, 2 insertions, 0 deletions
diff --git a/railties/guides/source/configuring.textile b/railties/guides/source/configuring.textile
index cd6e7d116e..809948b41e 100644
--- a/railties/guides/source/configuring.textile
+++ b/railties/guides/source/configuring.textile
@@ -263,6 +263,8 @@ h4. Configuring Active Record
* +config.active_record.whitelist_attributes+ will create an empty whitelist of attributes available for mass-assignment security for all models in your app.
+* +config.active_record.identity_map+ controls whether the identity map is enabled, and is false by default.
+
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.