diff options
| author | Robin Dupret <robin.dupret@gmail.com> | 2015-02-24 22:22:15 +0100 |
|---|---|---|
| committer | Robin Dupret <robin.dupret@gmail.com> | 2015-02-24 22:22:15 +0100 |
| commit | 803ef74f9bbcbc71af12060157a996f7b65e24db (patch) | |
| tree | 453d059d2abd45455032674ba58c0bca006e3c18 | |
| parent | 948424d5566dcacb726124d343d013d299c90105 (diff) | |
| download | rails-803ef74f9bbcbc71af12060157a996f7b65e24db.tar.gz rails-803ef74f9bbcbc71af12060157a996f7b65e24db.tar.bz2 rails-803ef74f9bbcbc71af12060157a996f7b65e24db.zip | |
Tiny documentation edits [ci skip]
| -rw-r--r-- | activerecord/lib/active_record/associations.rb | 4 | ||||
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb | 2 | ||||
| -rw-r--r-- | guides/source/association_basics.md | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 0b33ee881b..cecb2dbd0b 100644 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -1019,7 +1019,7 @@ module ActiveRecord # can affect what it does. # # Note that <tt>:dependent</tt> option is ignored for +has_one+ <tt>:through</tt> associations. - # + # # === Delete or destroy? # # +has_many+ and +has_and_belongs_to_many+ associations have the methods <tt>destroy</tt>, @@ -1529,8 +1529,6 @@ module ActiveRecord # NOTE: <tt>required</tt> is set to <tt>true</tt> by default and is deprecated. If # you don't want to have association presence validated, use <tt>optional: true</tt>. # - # - # # Option examples: # belongs_to :firm, foreign_key: "client_of" # belongs_to :person, primary_key: "name", foreign_key: "person_name" diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb index 0438c95bd7..d42f9a894b 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb @@ -770,7 +770,7 @@ module ActiveRecord # # Check a foreign key exists # foreign_key_exists?(:accounts, :branches) # - # # Check a foreign key on specified column exists + # # Check a foreign key on a specified column exists # foreign_key_exists?(:accounts, column: :owner_id) # # # Check a foreign key with a custom name exists diff --git a/guides/source/association_basics.md b/guides/source/association_basics.md index 0079049d44..d6b2e75e1e 100644 --- a/guides/source/association_basics.md +++ b/guides/source/association_basics.md @@ -959,7 +959,8 @@ If you set the `:validate` option to `true`, then associated objects will be val ##### `:optional` -If you set the `:optional` option to `true`, then associated object will be validated for presence. By default, this is `false`: associated objects will be validated for presence. +If you set the `:optional` option to `true`, then the presence of the associated +object won't be validated. By default, this option is set to `false`. #### Scopes for `belongs_to` |