Fix merge conflicts for #19938

This is a separate commit, as it is not just a changelog conflict. Want
to point out the changes in the code

1 files changed, 6 insertions, 0 deletions

diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb
index d334a2740e..690ab1af4b 100644
--- a/activerecord/test/schema/schema.rb
+++ b/activerecord/test/schema/schema.rb
@@ -253,6 +253,7 @@ ActiveRecord::Schema.define do
     t.string   :first_name
     t.integer  :salary, default: 70000
     t.integer :firm_id
+    t.integer :mentor_id
     if subsecond_precision_supported?
       t.datetime :created_at, precision: 6
       t.datetime :updated_at, precision: 6
@@ -452,6 +453,10 @@ ActiveRecord::Schema.define do
     t.string :name
   end
 
+  create_table :mentors, force: true do |t|
+    t.string :name
+  end
+
   create_table :minivans, force: true, id: false do |t|
     t.string :minivan_id
     t.string :name
@@ -660,6 +665,7 @@ ActiveRecord::Schema.define do
     t.string :name
     t.string :type
     t.integer :firm_id
+    t.integer :mentor_id
   end
 
   create_table :randomly_named_table1, force: true do |t|