diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-03-27 23:50:39 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-03-27 23:50:39 +0200 |
| commit | eea6a65488e3f590d4d9cd922f54febb151799ad (patch) | |
| tree | a3801ac70aa28d0c60cdc369e4d22b6c5014bbe5 /railties | |
| parent | 884e39f69eb8012b7ce455747d1b8aa7b34d83d3 (diff) | |
| parent | 6194c6d13b1349228baa85bf19b4f502011365a4 (diff) | |
| download | rails-eea6a65488e3f590d4d9cd922f54febb151799ad.tar.gz rails-eea6a65488e3f590d4d9cd922f54febb151799ad.tar.bz2 rails-eea6a65488e3f590d4d9cd922f54febb151799ad.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/guides/source/active_record_validations_callbacks.textile | 2 | ||||
| -rw-r--r-- | railties/guides/source/testing.textile | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/railties/guides/source/active_record_validations_callbacks.textile b/railties/guides/source/active_record_validations_callbacks.textile index e5349d546c..514d0322b9 100644 --- a/railties/guides/source/active_record_validations_callbacks.textile +++ b/railties/guides/source/active_record_validations_callbacks.textile @@ -84,6 +84,7 @@ The following methods skip validations, and will save the object to the database * +toggle!+ * +update_all+ * +update_attribute+ +* +update_column+ * +update_counters+ Note that +save+ also has the ability to skip validations if passed +:validate => false+ as argument. This technique should be used with caution. @@ -993,6 +994,7 @@ Just as with validations, it's also possible to skip callbacks. These methods sh * +increment+ * +increment_counter+ * +toggle+ +* +update_column+ * +update_all+ * +update_counters+ diff --git a/railties/guides/source/testing.textile b/railties/guides/source/testing.textile index 4ebdb3edf6..d3f72509c6 100644 --- a/railties/guides/source/testing.textile +++ b/railties/guides/source/testing.textile @@ -81,7 +81,7 @@ Each fixture is given a name followed by an indented list of colon-separated key h5. ERb'in It Up -ERb allows you embed ruby code within templates. Both the YAML and CSV fixture formats are pre-processed with ERb when you load fixtures. This allows you to use Ruby to help you generate some sample data. +ERb allows you to embed ruby code within templates. Both the YAML and CSV fixture formats are pre-processed with ERb when you load fixtures. This allows you to use Ruby to help you generate some sample data. <erb> <% earth_size = 20 %> @@ -227,7 +227,7 @@ $ rake db:migrate $ rake db:test:load </shell> -Above +rake db:migrate+ runs any pending migrations on the _development_ environment and updates +db/schema.rb+. +rake db:test:load+ recreates the test database from the current +db/schema.rb+. On subsequent attempts, it is a good idea to first run +db:test:prepare+, as it first checks for pending migrations and warns you appropriately. +The +rake db:migrate+ above runs any pending migrations on the _development_ environment and updates +db/schema.rb+. The +rake db:test:load+ recreates the test database from the current +db/schema.rb+. On subsequent attempts, it is a good idea to first run +db:test:prepare+, as it first checks for pending migrations and warns you appropriately. NOTE: +db:test:prepare+ will fail with an error if +db/schema.rb+ doesn't exist. |