Skip to content
Browse files

Collapse nested conditional

  • Loading branch information...
1 parent 636624f commit 7701c6f1c012abb09cd61d3092fbb40fc77aeb6d @jeremy jeremy committed Sep 17, 2009
Showing with 13 additions and 15 deletions.
  1. +13 −15 activerecord/lib/active_record/base.rb
View
28 activerecord/lib/active_record/base.rb
@@ -1654,22 +1654,20 @@ def instantiate(record)
if subclass_name.empty?
allocate
- else
- # Ignore type if no column is present since it was probably
- # pulled in from a sloppy join.
- unless columns_hash.include?(inheritance_column)
- allocate
+ # Ignore type if no column is present since it was probably
+ # pulled in from a sloppy join.
+ elsif !columns_hash.include?(inheritance_column)
+ allocate
- else
- begin
- compute_type(subclass_name).allocate
- rescue NameError
- raise SubclassNotFound,
- "The single-table inheritance mechanism failed to locate the subclass: '#{record[inheritance_column]}'. " +
- "This error is raised because the column '#{inheritance_column}' is reserved for storing the class in case of inheritance. " +
- "Please rename this column if you didn't intend it to be used for storing the inheritance class " +
- "or overwrite #{self.to_s}.inheritance_column to use another column for that information."
- end
+ else
+ begin
+ compute_type(subclass_name).allocate
+ rescue NameError
+ raise SubclassNotFound,
+ "The single-table inheritance mechanism failed to locate the subclass: '#{record[inheritance_column]}'. " +
+ "This error is raised because the column '#{inheritance_column}' is reserved for storing the class in case of inheritance. " +
+ "Please rename this column if you didn't intend it to be used for storing the inheritance class " +
+ "or overwrite #{self.to_s}.inheritance_column to use another column for that information."
end
end
else

0 comments on commit 7701c6f

Please sign in to comment.
Something went wrong with that request. Please try again.