diff options
| author | Steve Klabnik <steve@steveklabnik.com> | 2013-06-18 13:41:39 -0700 |
|---|---|---|
| committer | Steve Klabnik <steve@steveklabnik.com> | 2013-06-18 13:41:39 -0700 |
| commit | 353a398bee68c5ea99d76ac7601de0a5fef6f4a5 (patch) | |
| tree | c921c29a646734f17c648dcf78194a67c5fc8bdc | |
| parent | 37e6201eeb6994f4b1917c017f13ae1b51a1292d (diff) | |
| parent | d3abc8bc3d9cf907c7046d1e1057d9a48f1f2d29 (diff) | |
| download | rails-353a398bee68c5ea99d76ac7601de0a5fef6f4a5.tar.gz rails-353a398bee68c5ea99d76ac7601de0a5fef6f4a5.tar.bz2 rails-353a398bee68c5ea99d76ac7601de0a5fef6f4a5.zip | |
Merge pull request #10998 from Empact/tidy-changelog
Fix some activerecord changelog code to be displayed properly as code [ci skip]
| -rw-r--r-- | activerecord/CHANGELOG.md | 50 |
1 files changed, 26 insertions, 24 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 21b0a52180..963cdadba5 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -11,33 +11,35 @@ * Ambiguous reflections are on :through relationships are no longer supported. For example, you need to change this: - class Author < ActiveRecord::Base - has_many :posts - has_many :taggings, :through => :posts - end + class Author < ActiveRecord::Base + has_many :posts + has_many :taggings, :through => :posts + end - class Post < ActiveRecord::Base - has_one :tagging - has_many :taggings - end + class Post < ActiveRecord::Base + has_one :tagging + has_many :taggings + end - class Tagging < ActiveRecord::Base - end + class Tagging < ActiveRecord::Base + end To this: - class Author < ActiveRecord::Base - has_many :posts - has_many :taggings, :through => :posts, :source => :tagging - end + class Author < ActiveRecord::Base + has_many :posts + has_many :taggings, :through => :posts, :source => :tagging + end - class Post < ActiveRecord::Base - has_one :tagging - has_many :taggings - end + class Post < ActiveRecord::Base + has_one :tagging + has_many :taggings + end - class Tagging < ActiveRecord::Base - end + class Tagging < ActiveRecord::Base + end + + *Aaron Peterson* * Remove column restrictions for `count`, let the database raise if the SQL is invalid. The previous behavior was untested and surprising for the user. @@ -70,9 +72,9 @@ You can turn off the automatic detection of inverse associations by setting the `:inverse_of` option to `false` like so: - class Taggable < ActiveRecord::Base - belongs_to :tag, inverse_of: false - end + class Taggable < ActiveRecord::Base + belongs_to :tag, inverse_of: false + end *John Wang* @@ -110,7 +112,7 @@ * Deprecate `ConnectionAdapters::SchemaStatements#distinct`, as it is no longer used by internals. - *Ben Woosley# + *Ben Woosley* * Fix pending migrations error when loading schema and `ActiveRecord::Base.table_name_prefix` is not blank. |