Merge pull request #7791 from acapilleri/build_association

small refactoring of build_relation in uniqueness

activerecord/lib/active_record/validations/uniqueness.rb

@@ -64,14 +64,12 @@ def find_finder_class_for(record) #:nodoc:
       end
 
       def build_relation(klass, table, attribute, value) #:nodoc:
-        reflection = klass.reflect_on_association(attribute)
-        if reflection
-          column = klass.columns_hash[reflection.foreign_key]
+        if reflection = klass.reflect_on_association(attribute)
           attribute = reflection.foreign_key
           value = value.attributes[reflection.primary_key_column.name]
-        else
-          column = klass.columns_hash[attribute.to_s]
         end
+
+        column = klass.columns_hash[attribute.to_s]
         value = column.limit ? value.to_s[0, column.limit] : value.to_s if !value.nil? && column.text?
 
         if !options[:case_sensitive] && value && column.text?