From: David Gageot <david@gageot.net>
Date: Wed, 23 May 2012 07:13:47 +0000 (+0200)
Subject: Trying to fix filters on Oracle
X-Git-Tag: 3.1~114
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ecfbbb79cfe15b104e6701b48adf5ebb1ca99291;p=sonarqube.git

Trying to fix filters on Oracle
---

diff --git a/sonar-core/src/main/resources/org/sonar/core/filter/CriterionMapper-oracle.xml b/sonar-core/src/main/resources/org/sonar/core/filter/CriterionMapper-oracle.xml
index 5c9d27ac100..a3fdba73042 100644
--- a/sonar-core/src/main/resources/org/sonar/core/filter/CriterionMapper-oracle.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/filter/CriterionMapper-oracle.xml
@@ -4,9 +4,11 @@
 <mapper namespace="org.sonar.core.filter.CriterionMapper">
 
   <insert id="insert" parameterType="Criterion" keyColumn="id" useGeneratedKeys="true" keyProperty="id">
+    <selectKey order="BEFORE" resultType="Long" keyProperty="id">
+      select criteria_seq.NEXTVAL from DUAL
+    </selectKey>
     INSERT INTO criteria (id, filter_id, family, kee, operator, value, text_value, variation)
-    VALUES (criteria_seq.NEXTVAL, #{filterId, jdbcType=INTEGER}, #{family, jdbcType=VARCHAR}, #{key, jdbcType=VARCHAR}, #{operator, jdbcType=VARCHAR}, #{value, jdbcType=FLOAT},
-     #{textValue, jdbcType=VARCHAR}, #{variation})
+    VALUES (#{id}, #{filterId, jdbcType=INTEGER}, #{family, jdbcType=VARCHAR}, #{key, jdbcType=VARCHAR}, #{operator, jdbcType=VARCHAR}, #{value, jdbcType=FLOAT}, #{textValue, jdbcType=VARCHAR}, #{variation})
   </insert>
 
 </mapper>
diff --git a/sonar-core/src/main/resources/org/sonar/core/filter/FilterColumnMapper-oracle.xml b/sonar-core/src/main/resources/org/sonar/core/filter/FilterColumnMapper-oracle.xml
index e7705006f51..ee7e8982f96 100644
--- a/sonar-core/src/main/resources/org/sonar/core/filter/FilterColumnMapper-oracle.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/filter/FilterColumnMapper-oracle.xml
@@ -3,9 +3,12 @@
 
 <mapper namespace="org.sonar.core.filter.FilterColumnMapper">
 
-  <insert id="insert" parameterType="FilterColumn" keyColumn="id" useGeneratedKeys="true" keyProperty="id">
+  <insert id="insert" parameterType="FilterColumn" keyColumn="id" useGeneratedKeys="true" keyProperty ="id">
+    <selectKey order="BEFORE" resultType="Long" keyProperty="id" >
+        select filter_columns_seq.NEXTVAL from DUAL
+    </selectKey>
     INSERT INTO filter_columns (id, filter_id, family, kee, sort_direction, order_index, variation)
-    VALUES (filter_columns_seq.NEXTVAL, #{filterId, jdbcType=INTEGER}, #{family, jdbcType=VARCHAR}, #{key, jdbcType=VARCHAR}, #{sortDirection, jdbcType=VARCHAR},
+    VALUES ((#{id}, #{filterId, jdbcType=INTEGER}, #{family, jdbcType=VARCHAR}, #{key, jdbcType=VARCHAR}, #{sortDirection, jdbcType=VARCHAR},
      #{orderIndex, jdbcType=INTEGER}, #{variation})
   </insert>
 
diff --git a/sonar-core/src/main/resources/org/sonar/core/filter/FilterMapper-oracle.xml b/sonar-core/src/main/resources/org/sonar/core/filter/FilterMapper-oracle.xml
index 854b0749ff8..76ab33d4f61 100644
--- a/sonar-core/src/main/resources/org/sonar/core/filter/FilterMapper-oracle.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/filter/FilterMapper-oracle.xml
@@ -5,12 +5,12 @@
 
   <select id="findFilter" parameterType="string" resultType="Filter">
     select id, name, user_id as "userId", shared, favourites, resource_id as "resourceId", default_view as "defaultView", page_size as "pageSize", period_index as "periodIndex"
-    from filters WHERE name=#{id}
+    from filters WHERE name=#{id} and user_id is null
   </select>
 
-  <insert id="insert" parameterType="Filter" keyColumn="id" useGeneratedKeys="true" keyProperty="id">
-    <selectKey order="BEFORE" resultType="Long" keyProperty="id">
-      select filters_seq.NEXTVAL from DUAL
+  <insert id="insert" parameterType="Filter" keyColumn="id" useGeneratedKeys="true" keyProperty ="id">
+    <selectKey order="BEFORE" resultType="Long" keyProperty="id" >
+        select filters_seq.NEXTVAL from DUAL
     </selectKey>
     INSERT INTO filters (id, name, user_id, shared, favourites, resource_id, default_view, page_size, period_index)
     VALUES (#{id}, #{name, jdbcType=VARCHAR}, #{userId, jdbcType=FLOAT}, #{shared}, #{favourites}, #{resourceId, jdbcType=INTEGER}, #{defaultView, jdbcType=VARCHAR},
diff --git a/sonar-core/src/main/resources/org/sonar/core/filter/FilterMapper.xml b/sonar-core/src/main/resources/org/sonar/core/filter/FilterMapper.xml
index bd5859e55f4..7ef76f9904e 100644
--- a/sonar-core/src/main/resources/org/sonar/core/filter/FilterMapper.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/filter/FilterMapper.xml
@@ -5,7 +5,7 @@
 
   <select id="findFilter" parameterType="string" resultType="Filter">
     select id, name, user_id as "userId", shared, favourites, resource_id as "resourceId", default_view as "defaultView", page_size as "pageSize", period_index as "periodIndex"
-    from filters WHERE name=#{id}
+    from filters WHERE name=#{id} and user_id is null
   </select>
 
   <insert id="insert" parameterType="Filter" useGeneratedKeys="true" keyProperty="id">