SONAR-3876 fail to rename a profile containing quotes on postgresql

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/profile.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/profile.rb
index ca469daa5e0e6c21230d27f39e632b97737f3347..a9eb887503ff41cacb1d0f75946fa12c07fb3aaa 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/models/profile.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/models/profile.rb
@@ -169,9 +169,12 @@ class Profile < ActiveRecord::Base
           child.parent_name=new_name
           child.save
         end
-        # PROPERTIES.TEXT_VALUE is CLOB but not VARCHAR. The operator '=' is supported by all the databases except Oracle. For this reason 'like' must be used.
-        # Repeat avec me : Oracle rocks. 
-        Property.update_all({:text_value => new_name}, ['prop_key=? and text_value like ?', "sonar.profile.#{language}", old_name])
+        Property.with_key("sonar.profile.#{language}").each do |prop|
+          if prop.text_value==old_name
+            prop.text_value=new_name
+            prop.save
+          end
+        end
       end
     end
     self

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/index.html.erb
index 1189d89009fe0881329f64d24036469ac3d3f1be..0bd3305bdf9796d2be21368175cc20d7219457b8 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/index.html.erb
@@ -49,7 +49,7 @@
         </td>
 
         <td align="right" width="10%">
-          <span id="activated_rules_<%= u profile.key -%>"><%= profile.active_rules.count -%></span>
+          <span id="activated_rules_<%= u profile.key -%>"><%= profile.count_active_rules -%></span>
         </td>
 
         <td align="right" width="10%"><span id="alerts_<%= u profile.key -%>"><%= profile.alerts.size -%></span></td>