SONAR-5329 - Missing merge

diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/540_create_activities_table.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/540_create_activities_table.rb
index 93803c4c75d40e0adbb2be55fbfaab0e3cd0df32..207b371b689e2708f446c6f2744e3bd55d8b0e1b 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/540_create_activities_table.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/540_create_activities_table.rb
@@ -23,7 +23,6 @@
 # SONAR-5329
 #
 class CreateActivitiesTable < ActiveRecord::Migration
-
   def self.up
     create_table 'activities'do |t|
       t.column 'created_at',   :datetime, :null => false
@@ -32,8 +31,8 @@ class CreateActivitiesTable < ActiveRecord::Migration
       t.column 'log_type', :string, :limit => 50
       t.column 'log_action', :string, :limit => 50
       t.column 'log_message', :string, :limit => 4000
+      t.column 'log_key', :string
     end
-
+    add_index 'activities', :log_key, :unique => true, :name => 'activities_log_key'
   end
-
 end