Fix filters and dashboards on Oracle and Derby

Two SQL queries used a postgresql specific syntax.

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/filters_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/filters_controller.rb
index c876475584327016ab98175ab0af9618a6f0f866..79c1fb4c9c97cd3f8873f8be0f49b2bd81ffa204 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/filters_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/filters_controller.rb
@@ -28,7 +28,7 @@ class FiltersController < ApplicationController
   before_filter :login_required, :except => ['index', 'treemap']
 
   def manage
-    @filters = ::Filter.find(:all, :conditions => ['user_id=? or shared is true', current_user.id])
+    @filters = ::Filter.find(:all, :conditions => ['user_id=? or shared=?', current_user.id, true])
   end
 
   def new

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/widget_properties_helper.rb b/sonar-server/src/main/webapp/WEB-INF/app/helpers/widget_properties_helper.rb
index cdca2e2d28287a03a93094e6e7f18dd649d56bd1..cbf7fd35d00573a66dbaa68a9b53c503e15b9c16 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/helpers/widget_properties_helper.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/helpers/widget_properties_helper.rb
@@ -38,7 +38,7 @@ module WidgetPropertiesHelper
 
     elsif definition.type.name()==WidgetProperty::TYPE_FILTER
       user_filters = ::Filter.find(:all, :conditions => ['user_id=?', current_user.id]).sort_by(&:id).collect { |f| "<option value='#{f.id}'" + (value == f.id.to_s ? " selected='selected'" : "") + ">#{f.name}</option>" }
-      shared_filters = ::Filter.find(:all, :conditions => ['(user_id<>? or user_id is null) and shared is true', current_user.id]).sort_by(&:id).collect { |f| "<option value='#{f.id}'" + (value == f.id.to_s ? " selected='selected'" : "") + ">#{f.name}</option>" }
+      shared_filters = ::Filter.find(:all, :conditions => ['(user_id<>? or user_id is null) and shared=?', current_user.id, true]).sort_by(&:id).collect { |f| "<option value='#{f.id}'" + (value == f.id.to_s ? " selected='selected'" : "") + ">#{f.name}</option>" }
       all_filters = '<optgroup label="My Filters">' + user_filters.to_s + '</optgroup>' + '<optgroup label="Shared Filters">' + shared_filters.to_s + '</optgroup>'
 
       select_tag definition.key(), all_filters