Merge pull request #1404 from projectblacklight/db-migrations

Update database migrations to build the expected table structure from the start

Author: jcoyne

db/migrate/20140202020201_create_searches.rb

@@ -3,13 +3,11 @@ class CreateSearches < ActiveRecord::Migration
   def self.up
     create_table :searches do |t|
       t.text  :query_params
-      t.integer :user_id
+      t.integer :user_id, index: true
       t.string :user_type
 
       t.timestamps null: false
     end
-
-    add_index :searches, :user_id
   end
 
   def self.down

db/migrate/20140202020202_create_bookmarks.rb

@@ -2,9 +2,10 @@
 class CreateBookmarks < ActiveRecord::Migration
   def self.up
     create_table :bookmarks do |t|
-      t.integer :user_id, :null=>false
+      t.integer :user_id, index: true, null: false
       t.string :user_type
-      t.string :document_id
+      t.string :document_id, index: true
+      t.string :document_type
       t.string :title
       t.timestamps null: false
     end

db/migrate/20140320000000_add_polymorphic_type_to_bookmarks.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 class AddPolymorphicTypeToBookmarks < ActiveRecord::Migration
   def change
-    add_column(:bookmarks, :document_type, :string)
+    add_column(:bookmarks, :document_type, :string) unless Bookmark.connection.column_exists? :bookmarks, :document_type
 
-    add_index :bookmarks, :user_id
+    add_index :bookmarks, :user_id unless Bookmark.connection.index_exists? :bookmarks, :user_id
   end
 end