SONAR-3755 Add id in action_plans_issues test data

diff --git a/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl b/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl
index b02576d69336e6bbb72e3474676ee68e89e306aa..a57ece8a98202cb58e68fbe0362f4fed715180d5 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl
+++ b/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl
@@ -554,6 +554,7 @@ CREATE TABLE "ISSUE_CHANGES" (
 );
 
 CREATE TABLE "ACTION_PLANS_ISSUES" (
+  "ID" INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 1, INCREMENT BY 1),
   "ACTION_PLAN_ID" INTEGER,
   "ISSUE_ID" INTEGER
 );

diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanIssueDaoTest/should_find_by_issue_ids.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanIssueDaoTest/should_find_by_issue_ids.xml
index b68c783aa1adf6a2b5485d65e3d61bfb3a546f87..a54057a38100b3ae9f5d8a56d7fb685a4e3480a7 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanIssueDaoTest/should_find_by_issue_ids.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanIssueDaoTest/should_find_by_issue_ids.xml
@@ -3,17 +3,17 @@
   <action_plans id="1" project_id="1" name="SHORT_TERM" description="[null]" deadline="[null]"
                 user_login="igor" status="[null]" created_at="[null]" updated_at="[null]" />
 
-  <action_plans_issues action_plan_id="1" issue_id="250" />
+  <action_plans_issues id="1" action_plan_id="1" issue_id="250" />
 
   <action_plans id="2" project_id="1" name="SHORT_TERM" description="[null]" deadline="[null]"
                 user_login="igor" status="[null]" created_at="[null]" updated_at="[null]" />
 
-  <action_plans_issues action_plan_id="2" issue_id="251" />
-  <action_plans_issues action_plan_id="2" issue_id="252" />
+  <action_plans_issues id="2" action_plan_id="2" issue_id="251" />
+  <action_plans_issues id="3" action_plan_id="2" issue_id="252" />
 
   <action_plans id="3" project_id="1" name="SHORT_TERM" description="[null]" deadline="[null]"
                 user_login="igor" status="[null]" created_at="[null]" updated_at="[null]" />
 
-  <action_plans_issues action_plan_id="3" issue_id="253" />
+  <action_plans_issues id="4" action_plan_id="3" issue_id="253" />
 
 </dataset>

diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteProject.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteProject.xml
index 453df7601839b4cb4592c0887e3dc74238ef7152..84bcf6e1bfec97f2aef4d90629acb754cd7b04f3 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteProject.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteProject.xml
@@ -21,7 +21,7 @@
 
   <action_plans_reviews action_plan_id="1" review_id="250" />
 
-  <action_plans_issues action_plan_id="1" issue_id="250" />
+  <action_plans_issues id="1" action_plan_id="1" issue_id="250" />
 
   <reviews id="1" project_id="1" resource_id="1" status="CLOSED"
         rule_failure_permanent_id="1" resolution="[null]" created_at="[null]" resource_line="200" severity="BLOCKER"