aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2015-04-03 22:05:42 +1030
committerMatthew Draper <matthew@trebex.net>2015-04-03 22:05:42 +1030
commit90acb66c3df047fc80ef627a469c57aa73068307 (patch)
tree95a242b4afef4bbf9d03f9b462382f0e8cd71a69
parenta05f3e5f96f7a8aa55483d91becdbe49b81833fd (diff)
parent9452dc9c0a78610cd97197886d4f379c649a4f3d (diff)
downloadrails-90acb66c3df047fc80ef627a469c57aa73068307.tar.gz
rails-90acb66c3df047fc80ef627a469c57aa73068307.tar.bz2
rails-90acb66c3df047fc80ef627a469c57aa73068307.zip
Merge pull request #19627 from koenpunt/patch-1
remove duplicates
-rw-r--r--activerecord/lib/active_record/model_schema.rb4
1 files changed, 0 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/model_schema.rb b/activerecord/lib/active_record/model_schema.rb
index 75adcccce6..3674f672cb 100644
--- a/activerecord/lib/active_record/model_schema.rb
+++ b/activerecord/lib/active_record/model_schema.rb
@@ -328,12 +328,8 @@ module ActiveRecord
@default_attributes = nil
@inheritance_column = nil unless defined?(@explicit_inheritance_column) && @explicit_inheritance_column
@attributes_builder = nil
- @column_names = nil
- @attribute_types = nil
@columns = nil
@columns_hash = nil
- @content_columns = nil
- @default_attributes = nil
@attribute_names = nil
end