From 0269f5c8de13f6d36b03708ab974bf3d9842f143 Mon Sep 17 00:00:00 2001
From: David Gageot <david@gageot.net>
Date: Tue, 10 Jul 2012 16:52:56 +0200
Subject: [PATCH] SONAR-3437 fix mapping for Oracle

---
 .../org/sonar/api/database/model/MeasureMapper-oracle.xml    | 5 +----
 .../resources/org/sonar/api/database/model/MeasureMapper.xml | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

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 b64fb242646..2e4c7fd0d2f 100644
--- 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 c6eee0d29f7..c89f8eed8d1 100644
--- 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">
-- 
2.39.5