SONAR-3437 fix mapping for Oracle

diff --git a/sonar-plugin-api/src/main/resources/org/sonar/api/database/model/MeasureMapper-oracle.xml b/sonar-plugin-api/src/main/resources/org/sonar/api/database/model/MeasureMapper-oracle.xml
index b64fb24264666f85264d8b36c1af5ca36e2fa8f4..2e4c7fd0d2f64db043dbc9a3b50c7669ddfe9b18 100644 (file)
--- a/sonar-plugin-api/src/main/resources/org/sonar/api/database/model/MeasureMapper-oracle.xml
+++ b/sonar-plugin-api/src/main/resources/org/sonar/api/database/model/MeasureMapper-oracle.xml
@@ -36,11 +36,8 @@
   </insert>
 
   <insert id="insertData" parameterType="MeasureModel" useGeneratedKeys="false">
-    <selectKey order="BEFORE" resultType="Long" keyProperty="id">
-      select measure_data_seq.NEXTVAL from DUAL
-    </selectKey>
     INSERT INTO measure_data (id, measure_id, snapshot_id, data)
-    VALUES (#{id}, #{measureData.measure.id}, #{snapshotId}, #{measureData.data}) 
+    VALUES (measure_data_seq.NEXTVAL, #{id}, #{snapshotId}, #{measureData.data})
   </insert>
   
   <update id="update" parameterType="MeasureModel">

diff --git a/sonar-plugin-api/src/main/resources/org/sonar/api/database/model/MeasureMapper.xml b/sonar-plugin-api/src/main/resources/org/sonar/api/database/model/MeasureMapper.xml
index c6eee0d29f793c5a37417dccb824660806397c85..c89f8eed8d1450cb884c52ede49621851f56962c 100644 (file)
--- a/sonar-plugin-api/src/main/resources/org/sonar/api/database/model/MeasureMapper.xml
+++ b/sonar-plugin-api/src/main/resources/org/sonar/api/database/model/MeasureMapper.xml
@@ -31,7 +31,7 @@
   
   <insert id="insertData" parameterType="MeasureModel" useGeneratedKeys="false">
     INSERT INTO measure_data (measure_id, snapshot_id, data)
-    VALUES (#{measureData.measure.id}, #{snapshotId}, #{measureData.data}) 
+    VALUES (#{id}, #{snapshotId}, #{measureData.data})
   </insert>
   
   <update id="update" parameterType="MeasureModel">