SONAR-4395 The SQL request used to get hotspot on metric can be improved

diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/hotspots/hotspot_metric.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/hotspots/hotspot_metric.html.erb
index 09a42b4d6bd4c9431bd41c4ce186fbdca55aea37..103b9ac8bada439476be07b69793b76346fc6960 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/hotspots/hotspot_metric.html.erb
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/hotspots/hotspot_metric.html.erb
@@ -11,8 +11,7 @@
      if metric.numeric? && !@snapshot.leaves_qualifiers.empty?
        snapshots_conditions=["snapshots.qualifier in (:qualifiers)", "snapshots.islast=:islast", "snapshots.status = 'P'"]
        snapshots_values={:qualifiers => @snapshot.leaves_qualifiers, :islast => true}
-       snapshots_conditions << '(snapshots.id=:sid OR (snapshots.root_snapshot_id=:root_sid AND snapshots.path LIKE :path))'
-       snapshots_values[:sid]=@snapshot.id
+       snapshots_conditions << '(snapshots.root_snapshot_id=:root_sid AND snapshots.path LIKE :path)'
        snapshots_values[:root_sid] = (@snapshot.root_snapshot_id || @snapshot.id)
        snapshots_values[:path]="#{@snapshot.path}#{@snapshot.id}.%"
 

diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/hotspots/hotspot_most_violated_resources.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/hotspots/hotspot_most_violated_resources.html.erb
index a26c9e73eca7232aa7f946eaac454775edfcaf07..af7aaf65adf3b30f082d463bf84d5a9c634f68e1 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/hotspots/hotspot_most_violated_resources.html.erb
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/hotspots/hotspot_most_violated_resources.html.erb
@@ -4,8 +4,7 @@
 
    snapshots_conditions=["snapshots.qualifier in (:qualifiers)", "snapshots.islast=:islast", "snapshots.status = 'P'"]
    snapshots_values={:qualifiers => @snapshot.leaves_qualifiers, :islast => true}
-   snapshots_conditions << '(snapshots.id=:sid OR (snapshots.root_snapshot_id=:root_sid AND snapshots.path LIKE :path))'
-   snapshots_values[:sid]=@snapshot.id
+   snapshots_conditions << '(snapshots.root_snapshot_id=:root_sid AND snapshots.path LIKE :path)'
    snapshots_values[:root_sid] = (@snapshot.root_snapshot_id || @snapshot.id)
    snapshots_values[:path]="#{@snapshot.path}#{@snapshot.id}.%"