SONAR-4716 Fix query on Oracle

diff --git a/sonar-core/src/main/resources/org/sonar/core/technicaldebt/db/RequirementMapper.xml b/sonar-core/src/main/resources/org/sonar/core/technicaldebt/db/RequirementMapper.xml
index 01573ef399a184d71012d2f8460697bffcdc18d0..332f35bcc779e4f08d981e94a1a02a915950a549 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/core/technicaldebt/db/RequirementMapper.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/technicaldebt/db/RequirementMapper.xml
@@ -31,8 +31,8 @@
     inner join characteristic_edges char_to_root_char on char_to_root_char.child_id = characteristic.id
     inner join characteristics root_char on root_char.id = char_to_root_char.parent_id and root_char.enabled = ${_true}
     <where>
-      req.rule_id=#{ruleId}
-      and req.enabled=${_true}
+      req.rule_id = #{ruleId}
+      and req.enabled = ${_true}
     </where>
   </select>
 

diff --git a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/RequirementDaoTest/select_requirement_from_rule.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/RequirementDaoTest/select_requirement_from_rule.xml
index d6ba191b1f24eaffc2f32edd0f6e2039a46f5040..ef52fa2443829753c2211d9c6b0d360d816ae834 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/RequirementDaoTest/select_requirement_from_rule.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/RequirementDaoTest/select_requirement_from_rule.xml
@@ -3,13 +3,13 @@
   <quality_models id="1" name="TECHNICAL_DEBT"/>
 
   <characteristics id="1" kee="COMPILER_RELATED_PORTABILITY" name="Compiler related portability" quality_model_id="1" rule_id="[null]" characteristic_order="1" depth="2"
-                   description="[null]" enabled="true"/>
+                   description="[null]" enabled="[true]"/>
 
   <!-- requirement -->
   <characteristics id="2" kee="[null]" name="[null]" quality_model_id="1" rule_id="1" characteristic_order="6" depth="3"
-                   description="[null]" enabled="true"/>
+                   description="[null]" enabled="[true]"/>
 
-  <characteristics id="3" kee="PORTABILITY" name="Portability" quality_model_id="1" rule_id="[null]" characteristic_order="2" depth="1" description="[null]" enabled="true"/>
+  <characteristics id="3" kee="PORTABILITY" name="Portability" quality_model_id="1" rule_id="[null]" characteristic_order="2" depth="1" description="[null]" enabled="[true]"/>
 
   <characteristic_edges child_id="1" parent_id="3"/>
   <characteristic_edges child_id="2" parent_id="1"/>

diff --git a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/RequirementDaoTest/select_requirement_from_rule_with_two_properties.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/RequirementDaoTest/select_requirement_from_rule_with_two_properties.xml
index 68b47810184cb8a347af3e97db7252a8dfda8194..1c4fa7ec836571ebb8f52322186f325c987bea50 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/RequirementDaoTest/select_requirement_from_rule_with_two_properties.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/RequirementDaoTest/select_requirement_from_rule_with_two_properties.xml
@@ -3,13 +3,13 @@
   <quality_models id="1" name="TECHNICAL_DEBT"/>
 
   <characteristics id="1" kee="COMPILER_RELATED_PORTABILITY" name="Compiler related portability" quality_model_id="1" rule_id="[null]" characteristic_order="1" depth="2"
-                   description="[null]" enabled="true"/>
+                   description="[null]" enabled="[true]"/>
 
   <!-- requirement -->
   <characteristics id="2" kee="[null]" name="[null]" quality_model_id="1" rule_id="1" characteristic_order="6" depth="3"
-                   description="[null]" enabled="true"/>
+                   description="[null]" enabled="[true]"/>
 
-  <characteristics id="3" kee="PORTABILITY" name="Portability" quality_model_id="1" rule_id="[null]" characteristic_order="2" depth="1" description="[null]" enabled="true"/>
+  <characteristics id="3" kee="PORTABILITY" name="Portability" quality_model_id="1" rule_id="[null]" characteristic_order="2" depth="1" description="[null]" enabled="[true]"/>
 
   <characteristic_edges child_id="1" parent_id="3"/>
   <characteristic_edges child_id="2" parent_id="1"/>