1 files changed, 9 insertions, 7 deletions
diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb
index 025184f63a..2a8996f35c 100644
--- a/activerecord/test/schema/schema.rb
+++ b/activerecord/test/schema/schema.rb
@@ -104,6 +104,7 @@ ActiveRecord::Schema.define do
     t.column :author_visibility, :integer, default: 0
     t.column :illustrator_visibility, :integer, default: 0
     t.column :font_size, :integer, default: 0
+    t.column :cover, :string, default: 'hard'
   end
 
   create_table :booleans, force: true do |t|
@@ -201,12 +202,11 @@ ActiveRecord::Schema.define do
     t.integer :rating, default: 1
     t.integer :account_id
     t.string :description, default: ""
+    t.index [:firm_id, :type, :rating], name: "company_index"
+    t.index [:firm_id, :type], name: "company_partial_index", where: "rating > 10"
+    t.index :name, name: 'company_name_index', using: :btree
   end
 
-  add_index :companies, [:firm_id, :type, :rating], name: "company_index"
-  add_index :companies, [:firm_id, :type], name: "company_partial_index", where: "rating > 10"
-  add_index :companies, :name, name: 'company_name_index', using: :btree
-
   create_table :content, force: true do |t|
     t.string :title
   end
@@ -303,8 +303,8 @@ ActiveRecord::Schema.define do
   create_table :edges, force: true, id: false do |t|
     t.column :source_id, :integer, null: false
     t.column :sink_id,   :integer, null: false
+    t.index [:source_id, :sink_id], unique: true, name: 'unique_edge_index'
   end
-  add_index :edges, [:source_id, :sink_id], unique: true, name: 'unique_edge_index'
 
   create_table :engines, force: true do |t|
     t.integer :car_id
@@ -781,8 +781,8 @@ ActiveRecord::Schema.define do
     t.string :nick, null: false
     t.string :name
     t.column :books_count, :integer, null: false, default: 0
+    t.index :nick, unique: true
   end
-  add_index :subscribers, :nick, unique: true
 
   create_table :subscriptions, force: true do |t|
     t.string :subscriber_id
@@ -929,7 +929,7 @@ ActiveRecord::Schema.define do
     t.string :treaty_id
     t.string :name
   end
-  create_table :countries_treaties, force: true, id: false do |t|
+  create_table :countries_treaties, force: true, primary_key: [:country_id, :treaty_id] do |t|
     t.string :country_id, null: false
     t.string :treaty_id, null: false
   end
@@ -975,6 +975,8 @@ ActiveRecord::Schema.define do
     t.integer :employable_id
     t.string :employable_type
     t.integer :department_id
+    t.string :employable_list_type
+    t.integer :employable_list_id
   end
   create_table :recipes, force: true do |t|
     t.integer :chef_id