From 816efacb1f619a85cc5b3425c216bb0c0c766d18 Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Sun, 4 May 2014 10:52:09 -0300 Subject: Simplify unless conditional with OR --- .../lib/active_record/connection_adapters/abstract_adapter.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'activerecord/lib/active_record/connection_adapters') diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb index 435bdf61e5..46827b0dcd 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb @@ -393,10 +393,8 @@ module ActiveRecord def column_for(table_name, column_name) # :nodoc: column_name = column_name.to_s - unless column = columns(table_name).detect { |c| c.name == column_name } - raise ActiveRecordError, "No such column: #{table_name}.#{column_name}" - end - column + columns(table_name).detect { |c| c.name == column_name } || + raise(ActiveRecordError, "No such column: #{table_name}.#{column_name}") end end end -- cgit v1.2.3