Fix insertion of action plans

diff --git a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml b/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml
index 0b5f70aa77d3d0491029133552cd732392605a00..5c3a81d1fc01db90171580ae43747c14d7776d24 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml
@@ -33,7 +33,7 @@
     p.kee as componentKey
   </sql>
 
-  <insert id="insert" parameterType="Issue" useGeneratedKeys="true" keyProperty="id">
+  <insert id="insert" parameterType="Issue" useGeneratedKeys="false" keyProperty="id">
     INSERT INTO issues (kee, resource_id, rule_id, action_plan_key, severity, manual_severity, manual_issue, description, line, effort_to_fix, status,
     resolution, checksum, user_login, assignee_login, author_login, attributes, issue_creation_date, issue_update_date,
     issue_close_date, created_at, updated_at)

diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_action_plans.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_action_plans.xml
index dd71e3b16ebe79af49fd223c2d6b3627d85a8f0f..51e11ba1f9adde7a1183e924014596b9beb699ae 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_action_plans.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_action_plans.xml
@@ -2,7 +2,7 @@
 
   <issues
       id="100"
-      kee="ABCDE"
+      kee="ABCDE-1"
       resource_id="400"
       rule_id="500"
       action_plan_key="ABC"
@@ -28,7 +28,7 @@
 
   <issues
       id="101"
-      kee="ABCDE"
+      kee="ABCDE-2"
       resource_id="400"
       rule_id="500"
       action_plan_key="ABC"
@@ -55,7 +55,7 @@
 
   <issues
       id="102"
-      kee="ABCDE"
+      kee="ABCDE-3"
       resource_id="400"
       rule_id="501"
       action_plan_key="DEF"