Merge pull request #7185 from route/reset_table_name_refactoring

Refactor to reset_table_name

1 files changed, 4 insertions, 8 deletions

diff --git a/activerecord/lib/active_record/model_schema.rb b/activerecord/lib/active_record/model_schema.rb
index e6b76ddc4c..9981a9a804 100644
--- a/activerecord/lib/active_record/model_schema.rb
+++ b/activerecord/lib/active_record/model_schema.rb
@@ -144,16 +144,12 @@ module ActiveRecord
 
       # Computes the table name, (re)sets it internally, and returns it.
       def reset_table_name #:nodoc:
-        if abstract_class?
-          self.table_name = if active_record_super == Base || active_record_super.abstract_class?
-                              nil
-                            else
-                              active_record_super.table_name
-                            end
+        self.table_name = if abstract_class?
+          active_record_super == Base ? nil : active_record_super.table_name
         elsif active_record_super.abstract_class?
-          self.table_name = active_record_super.table_name || compute_table_name
+          active_record_super.table_name || compute_table_name
         else
-          self.table_name = compute_table_name
+          compute_table_name
         end
       end