SONAR-7903 add missing pk to ce_task_input

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/config/environment.rb b/server/sonar-web/src/main/webapp/WEB-INF/config/environment.rb
index 825def7bd25d72c70b9f3fbf1c339b66f49d7342..2c11674da9549acb50a8b42d7f2e48371c693220 100644 (file)
--- a/server/sonar-web/src/main/webapp/WEB-INF/config/environment.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/config/environment.rb
@@ -220,6 +220,14 @@ class ActiveRecord::Migration
     end
   end
 
+  def self.add_primary_key(tablename, columnname)
+    if dialect()=="mysql"
+      execute "ALTER TABLE `#{tablename}` ADD PRIMARY KEY (`#{columnname}`)"
+    else
+      execute "ALTER TABLE #{tablename} ADD CONSTRAINT pk_#{tablename} PRIMARY KEY (#{columnname})"
+    end
+  end
+
   # SONAR-4178
   def self.create_table(table_name, options = {})
     # Oracle constraint (see names of triggers and indices)

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1302_create_table_ce_task_input.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1302_create_table_ce_task_input.rb
index b1288272ea0300b6516e9453ec18062c1e0bc7f0..2beae9f27d81fa6bcb73cdc54b2108c20c079b23 100644 (file)
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1302_create_table_ce_task_input.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1302_create_table_ce_task_input.rb
@@ -30,6 +30,6 @@ class CreateTableCeTaskInput < ActiveRecord::Migration
       t.column 'created_at', :big_integer, :null => false
       t.column 'updated_at', :big_integer, :null => false
     end
-    add_index 'ce_task_input', 'task_uuid', :name => 'ce_task_input_uuid', :unique => true
+    add_primary_key 'ce_task_input', 'task_uuid'
   end
 end

diff --git a/sonar-db/src/main/resources/org/sonar/db/version/schema-h2.ddl b/sonar-db/src/main/resources/org/sonar/db/version/schema-h2.ddl
index 3aeed281ed84660a7142a1419d3ddab56a7f853c..e04367d317998e616f2d65ee3d68ba8f411dad9b 100644 (file)
--- a/sonar-db/src/main/resources/org/sonar/db/version/schema-h2.ddl
+++ b/sonar-db/src/main/resources/org/sonar/db/version/schema-h2.ddl
@@ -544,8 +544,7 @@ CREATE TABLE "CE_ACTIVITY" (
 );
 
 CREATE TABLE "CE_TASK_INPUT" (
-  "ID" INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 1, INCREMENT BY 1),
-  "TASK_UUID" VARCHAR(40) NOT NULL,
+  "TASK_UUID" VARCHAR(40) NOT NULL PRIMARY KEY,
   "DATA" BLOB(167772150),
   "CREATED_AT" BIGINT NOT NULL,
   "UPDATED_AT" BIGINT NOT NULL
@@ -701,8 +700,6 @@ CREATE INDEX "CE_ACTIVITY_ISLASTKEY" ON "CE_ACTIVITY" ("IS_LAST_KEY");
 
 CREATE INDEX "CE_ACTIVITY_ISLAST_STATUS" ON "CE_ACTIVITY" ("IS_LAST", "STATUS");
 
-CREATE UNIQUE INDEX "CE_TASK_INPUT_UUID" ON "CE_TASK_INPUT" ("TASK_UUID");
-
 CREATE UNIQUE INDEX "UNIQ_PERM_TPL_CHARAC" ON "PERM_TPL_CHARACTERISTICS" ("TEMPLATE_ID", "PERMISSION_KEY");
 
 CREATE UNIQUE INDEX "SCANNER_CONTEXT_ANALYSIS_UUID" ON "SCANNER_CONTEXT" ("ANALYSIS_UUID");