Fix and optimise DB schema

2 files changed, 11 insertions, 15 deletions

diff --git a/db/migrate/20180319190020_create_deploy_tokens.rb b/db/migrate/20180319190020_create_deploy_tokens.rb
index dfe85b3b552..6a681ba79d6 100644
--- a/db/migrate/20180319190020_create_deploy_tokens.rb
+++ b/db/migrate/20180319190020_create_deploy_tokens.rb
@@ -3,14 +3,15 @@ class CreateDeployTokens < ActiveRecord::Migration
 
   def change
     create_table :deploy_tokens do |t|
-      t.string :name, null: false
-      t.string :token, index: { unique: true }, null: false
-      t.boolean :read_repository, default: false
-      t.boolean :read_registry, default: false
       t.boolean :revoked, default: false
-      t.datetime :expires_at
+      t.boolean :read_repository, null: false, default: false
+      t.boolean :read_registry, null: false, default: false
 
+      t.datetime :expires_at
       t.timestamps null: false
+
+      t.string :name, null: false
+      t.string :token, index: { unique: true }, null: false
     end
   end
 end
diff --git a/db/migrate/20180405142733_create_project_deploy_tokens.rb b/db/migrate/20180405142733_create_project_deploy_tokens.rb
index c12f468828b..6cfb092a420 100644
--- a/db/migrate/20180405142733_create_project_deploy_tokens.rb
+++ b/db/migrate/20180405142733_create_project_deploy_tokens.rb
@@ -3,22 +3,17 @@ class CreateProjectDeployTokens < ActiveRecord::Migration
 
   DOWNTIME = false
 
-  disable_ddl_transaction!
-
-  def up
+  def change
     create_table :project_deploy_tokens do |t|
       t.integer :project_id, null: false
       t.integer :deploy_token_id, null: false
 
+      t.foreign_key :deploy_tokens, column: :deploy_token_id, on_delete: :cascade
+      t.foreign_key :projects, column: :project_id, on_delete: :cascade
+
       t.timestamps null: false
     end
 
-    add_concurrent_index :project_deploy_tokens, [:project_id, :deploy_token_id]
-  end
-
-  def down
-    drop_table :project_deploy_tokens
-
-    remove_index :project_deploy_tokens, column: [:project_id, :deploy_token_id] if index_exists?(:project_deploy_tokens, [:project_id, :deploy_token_id])
+    add_index :project_deploy_tokens, [:project_id, :deploy_token_id], unique: true
   end
 end