jro_apps/redmine Commit - r6107:bf15b06d98a8

Fixes filters on float values....

Jean-Philippe Lang -

r6107:bf15b06d98a8

parent child

Context file:

r6107:bf15b06d98a8

Collapse all files

app/models/query.rb +7 -6

              # Redmine - project management software
              # Copyright (C) 2006-2011  Jean-Philippe Lang
              #
              # This program is free software; you can redistribute it and/or
              # modify it under the terms of the GNU General Public License
              # as published by the Free Software Foundation; either version 2
              # of the License, or (at your option) any later version.
              #
              # This program is distributed in the hope that it will be useful,
              # but WITHOUT ANY WARRANTY; without even the implied warranty of
              # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
              # GNU General Public License for more details.
              #
              # You should have received a copy of the GNU General Public License
              # along with this program; if not, write to the Free Software
              # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
              class QueryColumn
                attr_accessor :name, :sortable, :groupable, :default_order
                include Redmine::I18n
                def initialize(name, options={})
                  self.name = name
                  self.sortable = options[:sortable]
                  self.groupable = options[:groupable] || false
                  if groupable == true
                    self.groupable = name.to_s
                  end
                  self.default_order = options[:default_order]
                  @caption_key = options[:caption] || "field_#{name}"
                end
                def caption
                  l(@caption_key)
                end
                # Returns true if the column is sortable, otherwise false
                def sortable?
                  !sortable.nil?
                end
                def value(issue)
                  issue.send name
                end
                def css_classes
                  name
                end
              end
              class QueryCustomFieldColumn < QueryColumn
                def initialize(custom_field)
                  self.name = "cf_#{custom_field.id}".to_sym
                  self.sortable = custom_field.order_statement || false
                  if %w(list date bool int).include?(custom_field.field_format)
                    self.groupable = custom_field.order_statement
                  end
                  self.groupable ||= false
                  @cf = custom_field
                end
                def caption
                  @cf.name
                end
                def custom_field
                  @cf
                end
                def value(issue)
                  cv = issue.custom_values.detect {|v| v.custom_field_id == @cf.id}
                  cv && @cf.cast_value(cv.value)
                end
                def css_classes
                  @css_classes ||= "#{name} #{@cf.field_format}"
                end
              end
              class Query < ActiveRecord::Base
                class StatementInvalid < ::ActiveRecord::StatementInvalid
                end
                belongs_to :project
                belongs_to :user
                serialize :filters
                serialize :column_names
                serialize :sort_criteria, Array
                attr_protected :project_id, :user_id
                validates_presence_of :name, :on => :save
                validates_length_of :name, :maximum => 255
                @@operators = { "="   => :label_equals,
                                "!"   => :label_not_equals,
                                "o"   => :label_open_issues,
                                "c"   => :label_closed_issues,
                                "!*"  => :label_none,
                                "*"   => :label_all,
                                ">="  => :label_greater_or_equal,
                                "<="  => :label_less_or_equal,
                                "><"  => :label_between,
                                "<t+" => :label_in_less_than,
                                ">t+" => :label_in_more_than,
                                "t+"  => :label_in,
                                "t"   => :label_today,
                                "w"   => :label_this_week,
                                ">t-" => :label_less_than_ago,
                                "<t-" => :label_more_than_ago,
                                "t-"  => :label_ago,
                                "~"   => :label_contains,
                                "!~"  => :label_not_contains }
                cattr_reader :operators
                @@operators_by_filter_type = { :list => [ "=", "!" ],
                                               :list_status => [ "o", "=", "!", "c", "*" ],
                                               :list_optional => [ "=", "!", "!*", "*" ],
                                               :list_subprojects => [ "*", "!*", "=" ],
                                               :date => [ "=", ">=", "<=", "><", "<t+", ">t+", "t+", "t", "w", ">t-", "<t-", "t-" ],
                                               :date_past => [ "=", ">=", "<=", "><", ">t-", "<t-", "t-", "t", "w" ],
                                               :string => [ "=", "~", "!", "!~" ],
                                               :text => [  "~", "!~" ],
+                                              # TODO: should be :numeric
                                               :integer => [ "=", ">=", "<=", "><", "!*", "*" ] }
                cattr_reader :operators_by_filter_type
                @@available_columns = [
                  QueryColumn.new(:project, :sortable => "#{Project.table_name}.name", :groupable => true),
                  QueryColumn.new(:tracker, :sortable => "#{Tracker.table_name}.position", :groupable => true),
                  QueryColumn.new(:parent, :sortable => ["#{Issue.table_name}.root_id", "#{Issue.table_name}.lft ASC"], :default_order => 'desc', :caption => :field_parent_issue),
                  QueryColumn.new(:status, :sortable => "#{IssueStatus.table_name}.position", :groupable => true),
                  QueryColumn.new(:priority, :sortable => "#{IssuePriority.table_name}.position", :default_order => 'desc', :groupable => true),
                  QueryColumn.new(:subject, :sortable => "#{Issue.table_name}.subject"),
                  QueryColumn.new(:author),
                  QueryColumn.new(:assigned_to, :sortable => ["#{User.table_name}.lastname", "#{User.table_name}.firstname", "#{User.table_name}.id"], :groupable => true),
                  QueryColumn.new(:updated_on, :sortable => "#{Issue.table_name}.updated_on", :default_order => 'desc'),
                  QueryColumn.new(:category, :sortable => "#{IssueCategory.table_name}.name", :groupable => true),
                  QueryColumn.new(:fixed_version, :sortable => ["#{Version.table_name}.effective_date", "#{Version.table_name}.name"], :default_order => 'desc', :groupable => true),
                  QueryColumn.new(:start_date, :sortable => "#{Issue.table_name}.start_date"),
                  QueryColumn.new(:due_date, :sortable => "#{Issue.table_name}.due_date"),
                  QueryColumn.new(:estimated_hours, :sortable => "#{Issue.table_name}.estimated_hours"),
                  QueryColumn.new(:done_ratio, :sortable => "#{Issue.table_name}.done_ratio", :groupable => true),
                  QueryColumn.new(:created_on, :sortable => "#{Issue.table_name}.created_on", :default_order => 'desc'),
                ]
                cattr_reader :available_columns
                named_scope :visible, lambda {|*args|
                  user = args.shift || User.current
                  base = Project.allowed_to_condition(user, :view_issues, *args)
                  user_id = user.logged? ? user.id : 0
                  {
                    :conditions => ["(#{table_name}.project_id IS NULL OR (#{base})) AND (#{table_name}.is_public = ? OR #{table_name}.user_id = ?)", true, user_id],
                    :include => :project
                  }
                }
                def initialize(attributes = nil)
                  super attributes
                  self.filters ||= { 'status_id' => {:operator => "o", :values => [""]} }
                end
                def after_initialize
                  # Store the fact that project is nil (used in #editable_by?)
                  @is_for_all = project.nil?
                end
                def validate
                  filters.each_key do |field|
                    errors.add label_for(field), :blank unless
                        # filter requires one or more values
                        (values_for(field) and !values_for(field).first.blank?) or
                        # filter doesn't require any value
                        ["o", "c", "!*", "*", "t", "w"].include? operator_for(field)
                  end if filters
                end
                # Returns true if the query is visible to +user+ or the current user.
                def visible?(user=User.current)
                  (project.nil? || user.allowed_to?(:view_issues, project)) && (self.is_public? || self.user_id == user.id)
                end
                def editable_by?(user)
                  return false unless user
                  # Admin can edit them all and regular users can edit their private queries
                  return true if user.admin? || (!is_public && self.user_id == user.id)
                  # Members can not edit public queries that are for all project (only admin is allowed to)
                  is_public && !@is_for_all && user.allowed_to?(:manage_public_queries, project)
                end
                def available_filters
                  return @available_filters if @available_filters
                  trackers = project.nil? ? Tracker.find(:all, :order => 'position') : project.rolled_up_trackers
                  @available_filters = { "status_id" => { :type => :list_status, :order => 1, :values => IssueStatus.find(:all, :order => 'position').collect{|s| [s.name, s.id.to_s] } },
                                         "tracker_id" => { :type => :list, :order => 2, :values => trackers.collect{|s| [s.name, s.id.to_s] } },
                                         "priority_id" => { :type => :list, :order => 3, :values => IssuePriority.all.collect{|s| [s.name, s.id.to_s] } },
                                         "subject" => { :type => :text, :order => 8 },
                                         "created_on" => { :type => :date_past, :order => 9 },
                                         "updated_on" => { :type => :date_past, :order => 10 },
                                         "start_date" => { :type => :date, :order => 11 },
                                         "due_date" => { :type => :date, :order => 12 },
                                         "estimated_hours" => { :type => :integer, :order => 13 },
                                         "done_ratio" =>  { :type => :integer, :order => 14 }}
                  user_values = []
                  user_values << ["<< #{l(:label_me)} >>", "me"] if User.current.logged?
                  if project
                    user_values += project.users.sort.collect{|s| [s.name, s.id.to_s] }
                  else
                    all_projects = Project.visible.all
                    if all_projects.any?
                      # members of visible projects
                      user_values += User.active.find(:all, :conditions => ["#{User.table_name}.id IN (SELECT DISTINCT user_id FROM members WHERE project_id IN (?))", all_projects.collect(&:id)]).sort.collect{|s| [s.name, s.id.to_s] }
                      # project filter
                      project_values = []
                      Project.project_tree(all_projects) do |p, level|
                        prefix = (level > 0 ? ('--' * level + ' ') : '')
                        project_values << ["#{prefix}#{p.name}", p.id.to_s]
                      end
                      @available_filters["project_id"] = { :type => :list, :order => 1, :values => project_values} unless project_values.empty?
                    end
                  end
                  @available_filters["assigned_to_id"] = { :type => :list_optional, :order => 4, :values => user_values } unless user_values.empty?
                  @available_filters["author_id"] = { :type => :list, :order => 5, :values => user_values } unless user_values.empty?
                  group_values = Group.all.collect {|g| [g.name, g.id.to_s] }
                  @available_filters["member_of_group"] = { :type => :list_optional, :order => 6, :values => group_values } unless group_values.empty?
                  role_values = Role.givable.collect {|r| [r.name, r.id.to_s] }
                  @available_filters["assigned_to_role"] = { :type => :list_optional, :order => 7, :values => role_values } unless role_values.empty?
                  if User.current.logged?
                    @available_filters["watcher_id"] = { :type => :list, :order => 15, :values => [["<< #{l(:label_me)} >>", "me"]] }
                  end
                  if project
                    # project specific filters
                    categories = @project.issue_categories.all
                    unless categories.empty?
                      @available_filters["category_id"] = { :type => :list_optional, :order => 6, :values => categories.collect{|s| [s.name, s.id.to_s] } }
                    end
                    versions = @project.shared_versions.all
                    unless versions.empty?
                      @available_filters["fixed_version_id"] = { :type => :list_optional, :order => 7, :values => versions.sort.collect{|s| ["#{s.project.name} - #{s.name}", s.id.to_s] } }
                    end
                    unless @project.leaf?
                      subprojects = @project.descendants.visible.all
                      unless subprojects.empty?
                        @available_filters["subproject_id"] = { :type => :list_subprojects, :order => 13, :values => subprojects.collect{|s| [s.name, s.id.to_s] } }
                      end
                    end
                    add_custom_fields_filters(@project.all_issue_custom_fields)
                  else
                    # global filters for cross project issue list
                    system_shared_versions = Version.visible.find_all_by_sharing('system')
                    unless system_shared_versions.empty?
                      @available_filters["fixed_version_id"] = { :type => :list_optional, :order => 7, :values => system_shared_versions.sort.collect{|s| ["#{s.project.name} - #{s.name}", s.id.to_s] } }
                    end
                    add_custom_fields_filters(IssueCustomField.find(:all, :conditions => {:is_filter => true, :is_for_all => true}))
                  end
                  @available_filters
                end
                def add_filter(field, operator, values)
                  # values must be an array
                  return unless values.nil? || values.is_a?(Array)
                  # check if field is defined as an available filter
                  if available_filters.has_key? field
                    filter_options = available_filters[field]
                    # check if operator is allowed for that filter
                    #if @@operators_by_filter_type[filter_options[:type]].include? operator
                    #  allowed_values = values & ([""] + (filter_options[:values] || []).collect {|val| val[1]})
                    #  filters[field] = {:operator => operator, :values => allowed_values } if (allowed_values.first and !allowed_values.first.empty?) or ["o", "c", "!*", "*", "t"].include? operator
                    #end
                    filters[field] = {:operator => operator, :values => (values || ['']) }
                  end
                end
                def add_short_filter(field, expression)
                  return unless expression
                  parms = expression.scan(/^(o|c|!\*|!|\*)?(.*)$/).first
                  add_filter field, (parms[0] || "="), [parms[1] || ""]
                end
                # Add multiple filters using +add_filter+
                def add_filters(fields, operators, values)
                  if fields.is_a?(Array) && operators.is_a?(Hash) && (values.nil? || values.is_a?(Hash))
                    fields.each do |field|
                      add_filter(field, operators[field], values && values[field])
                    end
                  end
                end
                def has_filter?(field)
                  filters and filters[field]
                end
                def type_for(field)
                  available_filters[field][:type] if available_filters.has_key?(field)
                end
                def operator_for(field)
                  has_filter?(field) ? filters[field][:operator] : nil
                end
                def values_for(field)
                  has_filter?(field) ? filters[field][:values] : nil
                end
                def value_for(field, index=0)
                  (values_for(field) || [])[index]
                end
                def label_for(field)
                  label = available_filters[field][:name] if available_filters.has_key?(field)
                  label ||= field.gsub(/\_id$/, "")
                end
                def available_columns
                  return @available_columns if @available_columns
                  @available_columns = Query.available_columns
                  @available_columns += (project ?
                                          project.all_issue_custom_fields :
                                          IssueCustomField.find(:all)
                                         ).collect {|cf| QueryCustomFieldColumn.new(cf) }
                end
                def self.available_columns=(v)
                  self.available_columns = (v)
                end
                def self.add_available_column(column)
                  self.available_columns << (column) if column.is_a?(QueryColumn)
                end
                # Returns an array of columns that can be used to group the results
                def groupable_columns
                  available_columns.select {|c| c.groupable}
                end
                # Returns a Hash of columns and the key for sorting
                def sortable_columns
                  {'id' => "#{Issue.table_name}.id"}.merge(available_columns.inject({}) {|h, column|
                                                             h[column.name.to_s] = column.sortable
                                                             h
                                                           })
                end
                def columns
                  if has_default_columns?
                    available_columns.select do |c|
                      # Adds the project column by default for cross-project lists
                      Setting.issue_list_default_columns.include?(c.name.to_s) || (c.name == :project && project.nil?)
                    end
                  else
                    # preserve the column_names order
                    column_names.collect {|name| available_columns.find {|col| col.name == name}}.compact
                  end
                end
                def column_names=(names)
                  if names
                    names = names.select {|n| n.is_a?(Symbol) || !n.blank? }
                    names = names.collect {|n| n.is_a?(Symbol) ? n : n.to_sym }
                    # Set column_names to nil if default columns
                    if names.map(&:to_s) == Setting.issue_list_default_columns
                      names = nil
                    end
                  end
                  write_attribute(:column_names, names)
                end
                def has_column?(column)
                  column_names && column_names.include?(column.name)
                end
                def has_default_columns?
                  column_names.nil? || column_names.empty?
                end
                def sort_criteria=(arg)
                  c = []
                  if arg.is_a?(Hash)
                    arg = arg.keys.sort.collect {|k| arg[k]}
                  end
                  c = arg.select {|k,o| !k.to_s.blank?}.slice(0,3).collect {|k,o| [k.to_s, o == 'desc' ? o : 'asc']}
                  write_attribute(:sort_criteria, c)
                end
                def sort_criteria
                  read_attribute(:sort_criteria) || []
                end
                def sort_criteria_key(arg)
                  sort_criteria && sort_criteria[arg] && sort_criteria[arg].first
                end
                def sort_criteria_order(arg)
                  sort_criteria && sort_criteria[arg] && sort_criteria[arg].last
                end
                # Returns the SQL sort order that should be prepended for grouping
                def group_by_sort_order
                  if grouped? && (column = group_by_column)
                    column.sortable.is_a?(Array) ?
                      column.sortable.collect {|s| "#{s} #{column.default_order}"}.join(',') :
                      "#{column.sortable} #{column.default_order}"
                  end
                end
                # Returns true if the query is a grouped query
                def grouped?
                  !group_by_column.nil?
                end
                def group_by_column
                  groupable_columns.detect {|c| c.groupable && c.name.to_s == group_by}
                end
                def group_by_statement
                  group_by_column.try(:groupable)
                end
                def project_statement
                  project_clauses = []
                  if project && !@project.descendants.active.empty?
                    ids = [project.id]
                    if has_filter?("subproject_id")
                      case operator_for("subproject_id")
                      when '='
                        # include the selected subprojects
                        ids += values_for("subproject_id").each(&:to_i)
                      when '!*'
                        # main project only
                      else
                        # all subprojects
                        ids += project.descendants.collect(&:id)
                      end
                    elsif Setting.display_subprojects_issues?
                      ids += project.descendants.collect(&:id)
                    end
                    project_clauses << "#{Project.table_name}.id IN (%s)" % ids.join(',')
                  elsif project
                    project_clauses << "#{Project.table_name}.id = %d" % project.id
                  end
                  project_clauses.any? ? project_clauses.join(' AND ') : nil
                end
                def statement
                  # filters clauses
                  filters_clauses = []
                  filters.each_key do |field|
                    next if field == "subproject_id"
                    v = values_for(field).clone
                    next unless v and !v.empty?
                    operator = operator_for(field)
                    # "me" value subsitution
                    if %w(assigned_to_id author_id watcher_id).include?(field)
                      v.push(User.current.logged? ? User.current.id.to_s : "0") if v.delete("me")
                    end
                    sql = ''
                    if field =~ /^cf_(\d+)$/
                      # custom field
                      db_table = CustomValue.table_name
                      db_field = 'value'
                      is_custom_filter = true
                      sql << "#{Issue.table_name}.id IN (SELECT #{Issue.table_name}.id FROM #{Issue.table_name} LEFT OUTER JOIN #{db_table} ON #{db_table}.customized_type='Issue' AND #{db_table}.customized_id=#{Issue.table_name}.id AND #{db_table}.custom_field_id=#{$1} WHERE "
                      sql << sql_for_field(field, operator, v, db_table, db_field, true) + ')'
                    elsif field == 'watcher_id'
                      db_table = Watcher.table_name
                      db_field = 'user_id'
                      sql << "#{Issue.table_name}.id #{ operator == '=' ? 'IN' : 'NOT IN' } (SELECT #{db_table}.watchable_id FROM #{db_table} WHERE #{db_table}.watchable_type='Issue' AND "
                      sql << sql_for_field(field, '=', v, db_table, db_field) + ')'
                    elsif field == "member_of_group" # named field
                      if operator == '*' # Any group
                        groups = Group.all
                        operator = '=' # Override the operator since we want to find by assigned_to
                      elsif operator == "!*"
                        groups = Group.all
                        operator = '!' # Override the operator since we want to find by assigned_to
                      else
                        groups = Group.find_all_by_id(v)
                      end
                      groups ||= []
                      members_of_groups = groups.inject([]) {|user_ids, group|
                        if group && group.user_ids.present?
                          user_ids << group.user_ids
                        end
                        user_ids.flatten.uniq.compact
                      }.sort.collect(&:to_s)
                      sql << '(' + sql_for_field("assigned_to_id", operator, members_of_groups, Issue.table_name, "assigned_to_id", false) + ')'
                    elsif field == "assigned_to_role" # named field
                      if operator == "*" # Any Role
                        roles = Role.givable
                        operator = '=' # Override the operator since we want to find by assigned_to
                      elsif operator == "!*" # No role
                        roles = Role.givable
                        operator = '!' # Override the operator since we want to find by assigned_to
                      else
                        roles = Role.givable.find_all_by_id(v)
                      end
                      roles ||= []
                      members_of_roles = roles.inject([]) {|user_ids, role|
                        if role && role.members
                          user_ids << role.members.collect(&:user_id)
                        end
                        user_ids.flatten.uniq.compact
                      }.sort.collect(&:to_s)
                      sql << '(' + sql_for_field("assigned_to_id", operator, members_of_roles, Issue.table_name, "assigned_to_id", false) + ')'
                    else
                      # regular field
                      db_table = Issue.table_name
                      db_field = field
                      sql << '(' + sql_for_field(field, operator, v, db_table, db_field) + ')'
                    end
                    filters_clauses << sql
                  end if filters and valid?
                  filters_clauses << project_statement
                  filters_clauses.reject!(&:blank?)
                  filters_clauses.any? ? filters_clauses.join(' AND ') : nil
                end
                # Returns the issue count
                def issue_count
                  Issue.count(:include => [:status, :project], :conditions => statement)
                rescue ::ActiveRecord::StatementInvalid => e
                  raise StatementInvalid.new(e.message)
                end
                # Returns the issue count by group or nil if query is not grouped
                def issue_count_by_group
                  r = nil
                  if grouped?
                    begin
                      # Rails will raise an (unexpected) RecordNotFound if there's only a nil group value
                      r = Issue.visible.count(:group => group_by_statement, :include => [:status, :project], :conditions => statement)
                    rescue ActiveRecord::RecordNotFound
                      r = {nil => issue_count}
                    end
                    c = group_by_column
                    if c.is_a?(QueryCustomFieldColumn)
                      r = r.keys.inject({}) {|h, k| h[c.custom_field.cast_value(k)] = r[k]; h}
                    end
                  end
                  r
                rescue ::ActiveRecord::StatementInvalid => e
                  raise StatementInvalid.new(e.message)
                end
                # Returns the issues
                # Valid options are :order, :offset, :limit, :include, :conditions
                def issues(options={})
                  order_option = [group_by_sort_order, options[:order]].reject {|s| s.blank?}.join(',')
                  order_option = nil if order_option.blank?
                  Issue.visible.find :all, :include => ([:status, :project] + (options[:include] || [])).uniq,
                                   :conditions => Query.merge_conditions(statement, options[:conditions]),
                                   :order => order_option,
                                   :limit  => options[:limit],
                                   :offset => options[:offset]
                rescue ::ActiveRecord::StatementInvalid => e
                  raise StatementInvalid.new(e.message)
                end
                # Returns the journals
                # Valid options are :order, :offset, :limit
                def journals(options={})
                  Journal.visible.find :all, :include => [:details, :user, {:issue => [:project, :author, :tracker, :status]}],
                                     :conditions => statement,
                                     :order => options[:order],
                                     :limit => options[:limit],
                                     :offset => options[:offset]
                rescue ::ActiveRecord::StatementInvalid => e
                  raise StatementInvalid.new(e.message)
                end
                # Returns the versions
                # Valid options are :conditions
                def versions(options={})
                  Version.visible.find :all, :include => :project,
                                     :conditions => Query.merge_conditions(project_statement, options[:conditions])
                rescue ::ActiveRecord::StatementInvalid => e
                  raise StatementInvalid.new(e.message)
                end
                private
                # Helper method to generate the WHERE sql for a +field+, +operator+ and a +value+
                def sql_for_field(field, operator, value, db_table, db_field, is_custom_filter=false)
                  sql = ''
                  case operator
                  when "="
                    if [:date, :date_past].include?(type_for(field))
                      sql = date_clause(db_table, db_field, (Date.parse(value.first) rescue nil), (Date.parse(value.first) rescue nil))
                    else
                      if value.any?
                        sql = "#{db_table}.#{db_field} IN (" + value.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + ")"
                      else
                        # IN an empty set
                        sql = "1=0"
                      end
                    end
                  when "!"
                    if value.any?
                      sql = "(#{db_table}.#{db_field} IS NULL OR #{db_table}.#{db_field} NOT IN (" + value.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + "))"
                    else
                      # NOT IN an empty set
                      sql = "1=1"
                    end
                  when "!*"
                    sql = "#{db_table}.#{db_field} IS NULL"
                    sql << " OR #{db_table}.#{db_field} = ''" if is_custom_filter
                  when "*"
                    sql = "#{db_table}.#{db_field} IS NOT NULL"
                    sql << " AND #{db_table}.#{db_field} <> ''" if is_custom_filter
                  when ">="
                    if [:date, :date_past].include?(type_for(field))
                      sql = date_clause(db_table, db_field, (Date.parse(value.first) rescue nil), nil)
                    else
                      if is_custom_filter
-                       sql = "CAST(#{db_table}.#{db_field} AS decimal(60,3)) >= #{value.first.to_i}"
+                       sql = "CAST(#{db_table}.#{db_field} AS decimal(60,3)) >= #{value.first.to_f}"
                      else
-                       sql = "#{db_table}.#{db_field} >= #{value.first.to_i}"
+                       sql = "#{db_table}.#{db_field} >= #{value.first.to_f}"
                      end
                    end
                  when "<="
                    if [:date, :date_past].include?(type_for(field))
                      sql = date_clause(db_table, db_field, nil, (Date.parse(value.first) rescue nil))
                    else
                      if is_custom_filter
-                       sql = "CAST(#{db_table}.#{db_field} AS decimal(60,3)) <= #{value.first.to_i}"
+                       sql = "CAST(#{db_table}.#{db_field} AS decimal(60,3)) <= #{value.first.to_f}"
                      else
-                       sql = "#{db_table}.#{db_field} <= #{value.first.to_i}"
+                       sql = "#{db_table}.#{db_field} <= #{value.first.to_f}"
                      end
                    end
                  when "><"
                    if [:date, :date_past].include?(type_for(field))
                      sql = date_clause(db_table, db_field, (Date.parse(value[0]) rescue nil), (Date.parse(value[1]) rescue nil))
                    else
                      if is_custom_filter
-                       sql = "CAST(#{db_table}.#{db_field} AS decimal(60,3)) BETWEEN #{value[0].to_i} AND #{value[1].to_i}"
+                       sql = "CAST(#{db_table}.#{db_field} AS decimal(60,3)) BETWEEN #{value[0].to_f} AND #{value[1].to_f}"
                      else
-                       sql = "#{db_table}.#{db_field} BETWEEN #{value[0].to_i} AND #{value[1].to_i}"
+                       sql = "#{db_table}.#{db_field} BETWEEN #{value[0].to_f} AND #{value[1].to_f}"
                      end
                    end
                  when "o"
                    sql = "#{IssueStatus.table_name}.is_closed=#{connection.quoted_false}" if field == "status_id"
                  when "c"
                    sql = "#{IssueStatus.table_name}.is_closed=#{connection.quoted_true}" if field == "status_id"
                  when ">t-"
                    sql = relative_date_clause(db_table, db_field, - value.first.to_i, 0)
                  when "<t-"
                    sql = relative_date_clause(db_table, db_field, nil, - value.first.to_i)
                  when "t-"
                    sql = relative_date_clause(db_table, db_field, - value.first.to_i, - value.first.to_i)
                  when ">t+"
                    sql = relative_date_clause(db_table, db_field, value.first.to_i, nil)
                  when "<t+"
                    sql = relative_date_clause(db_table, db_field, 0, value.first.to_i)
                  when "t+"
                    sql = relative_date_clause(db_table, db_field, value.first.to_i, value.first.to_i)
                  when "t"
                    sql = relative_date_clause(db_table, db_field, 0, 0)
                  when "w"
                    first_day_of_week = l(:general_first_day_of_week).to_i
                    day_of_week = Date.today.cwday
                    days_ago = (day_of_week >= first_day_of_week ? day_of_week - first_day_of_week : day_of_week + 7 - first_day_of_week)
                    sql = relative_date_clause(db_table, db_field, - days_ago, - days_ago + 6)
                  when "~"
                    sql = "LOWER(#{db_table}.#{db_field}) LIKE '%#{connection.quote_string(value.first.to_s.downcase)}%'"
                  when "!~"
                    sql = "LOWER(#{db_table}.#{db_field}) NOT LIKE '%#{connection.quote_string(value.first.to_s.downcase)}%'"
                  else
                    raise "Unknown query operator #{operator}"
                  end
                  return sql
                end
                def add_custom_fields_filters(custom_fields)
                  @available_filters ||= {}
                  custom_fields.select(&:is_filter?).each do |field|
                    case field.field_format
                    when "text"
                      options = { :type => :text, :order => 20 }
                    when "list"
                      options = { :type => :list_optional, :values => field.possible_values, :order => 20}
                    when "date"
                      options = { :type => :date, :order => 20 }
                    when "bool"
                      options = { :type => :list, :values => [[l(:general_text_yes), "1"], [l(:general_text_no), "0"]], :order => 20 }
                    when "int", "float"
                      options = { :type => :integer, :order => 20 }
                    when "user", "version"
                      next unless project
                      options = { :type => :list_optional, :values => field.possible_values_options(project), :order => 20}
                    else
                      options = { :type => :string, :order => 20 }
                    end
                    @available_filters["cf_#{field.id}"] = options.merge({ :name => field.name })
                  end
                end
                # Returns a SQL clause for a date or datetime field.
                def date_clause(table, field, from, to)
                  s = []
                  if from
                    s << ("#{table}.#{field} > '%s'" % [connection.quoted_date((from - 1).to_time.end_of_day)])
                  end
                  if to
                    s << ("#{table}.#{field} <= '%s'" % [connection.quoted_date(to.to_time.end_of_day)])
                  end
                  s.join(' AND ')
                end
                # Returns a SQL clause for a date or datetime field using relative dates.
                def relative_date_clause(table, field, days_from, days_to)
                  date_clause(table, field, (days_from ? Date.today + days_from : nil), (days_to ? Date.today + days_to : nil))
                end
              end

test/unit/query_test.rb +23 -6

              # Redmine - project management software
              # Copyright (C) 2006-2011  Jean-Philippe Lang
              #
              # This program is free software; you can redistribute it and/or
              # modify it under the terms of the GNU General Public License
              # as published by the Free Software Foundation; either version 2
              # of the License, or (at your option) any later version.
              #
              # This program is distributed in the hope that it will be useful,
              # but WITHOUT ANY WARRANTY; without even the implied warranty of
              # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
              # GNU General Public License for more details.
              #
              # You should have received a copy of the GNU General Public License
              # along with this program; if not, write to the Free Software
              # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
              require File.expand_path('../../test_helper', __FILE__)
              class QueryTest < ActiveSupport::TestCase
                fixtures :projects, :enabled_modules, :users, :members, :member_roles, :roles, :trackers, :issue_statuses, :issue_categories, :enumerations, :issues, :watchers, :custom_fields, :custom_values, :versions, :queries
                def test_custom_fields_for_all_projects_should_be_available_in_global_queries
                  query = Query.new(:project => nil, :name => '_')
                  assert query.available_filters.has_key?('cf_1')
                  assert !query.available_filters.has_key?('cf_3')
                end
                def test_system_shared_versions_should_be_available_in_global_queries
                  Version.find(2).update_attribute :sharing, 'system'
                  query = Query.new(:project => nil, :name => '_')
                  assert query.available_filters.has_key?('fixed_version_id')
                  assert query.available_filters['fixed_version_id'][:values].detect {|v| v.last == '2'}
                end
                def test_project_filter_in_global_queries
                  query = Query.new(:project => nil, :name => '_')
                  project_filter = query.available_filters["project_id"]
                  assert_not_nil project_filter
                  project_ids = project_filter[:values].map{|p| p[1]}
                  assert project_ids.include?("1")  #public project
                  assert !project_ids.include?("2") #private project user cannot see
                end
                def find_issues_with_query(query)
                  Issue.find :all,
                    :include => [ :assigned_to, :status, :tracker, :project, :priority ],
                    :conditions => query.statement
                end
                def assert_find_issues_with_query_is_successful(query)
                  assert_nothing_raised do
                    find_issues_with_query(query)
                  end
                end
                def assert_query_statement_includes(query, condition)
                  assert query.statement.include?(condition), "Query statement condition not found in: #{query.statement}"
                end
                def test_query_should_allow_shared_versions_for_a_project_query
                  subproject_version = Version.find(4)
                  query = Query.new(:project => Project.find(1), :name => '_')
                  query.add_filter('fixed_version_id', '=', [subproject_version.id.to_s])
                  assert query.statement.include?("#{Issue.table_name}.fixed_version_id IN ('4')")
                end
                def test_query_with_multiple_custom_fields
                  query = Query.find(1)
                  assert query.valid?
                  assert query.statement.include?("#{CustomValue.table_name}.value IN ('MySQL')")
                  issues = find_issues_with_query(query)
                  assert_equal 1, issues.length
                  assert_equal Issue.find(3), issues.first
                end
                def test_operator_none
                  query = Query.new(:project => Project.find(1), :name => '_')
                  query.add_filter('fixed_version_id', '!*', [''])
                  query.add_filter('cf_1', '!*', [''])
                  assert query.statement.include?("#{Issue.table_name}.fixed_version_id IS NULL")
                  assert query.statement.include?("#{CustomValue.table_name}.value IS NULL OR #{CustomValue.table_name}.value = ''")
                  find_issues_with_query(query)
                end
                def test_operator_none_for_integer
                  query = Query.new(:project => Project.find(1), :name => '_')
                  query.add_filter('estimated_hours', '!*', [''])
                  issues = find_issues_with_query(query)
                  assert !issues.empty?
                  assert issues.all? {|i| !i.estimated_hours}
                end
                def test_operator_all
                  query = Query.new(:project => Project.find(1), :name => '_')
                  query.add_filter('fixed_version_id', '*', [''])
                  query.add_filter('cf_1', '*', [''])
                  assert query.statement.include?("#{Issue.table_name}.fixed_version_id IS NOT NULL")
                  assert query.statement.include?("#{CustomValue.table_name}.value IS NOT NULL AND #{CustomValue.table_name}.value <> ''")
                  find_issues_with_query(query)
                end
+               def test_operator_is_on_float
+                 Issue.update_all("estimated_hours = 171.2", "id=2")
+                 query = Query.new(:name => '_')
+                 query.add_filter('estimated_hours', '=', ['171.20'])
+                 issues = find_issues_with_query(query)
+                 assert_equal 1, issues.size
+                 assert_equal 2, issues.first.id
+               end
                def test_operator_greater_than
                  query = Query.new(:project => Project.find(1), :name => '_')
                  query.add_filter('done_ratio', '>=', ['40'])
-                 assert query.statement.include?("#{Issue.table_name}.done_ratio >= 40")
+                 assert query.statement.include?("#{Issue.table_name}.done_ratio >= 40.0")
+                 find_issues_with_query(query)
+               end
+               def test_operator_greater_than_a_float
+                 query = Query.new(:project => Project.find(1), :name => '_')
+                 query.add_filter('estimated_hours', '>=', ['40.5'])
+                 assert query.statement.include?("#{Issue.table_name}.estimated_hours >= 40.5")
                  find_issues_with_query(query)
                end
                def test_operator_greater_than_on_custom_field
                  f = IssueCustomField.create!(:name => 'filter', :field_format => 'int', :is_filter => true, :is_for_all => true)
                  query = Query.new(:project => Project.find(1), :name => '_')
                  query.add_filter("cf_#{f.id}", '>=', ['40'])
-                 assert query.statement.include?("CAST(custom_values.value AS decimal(60,3)) >= 40")
+                 assert query.statement.include?("CAST(custom_values.value AS decimal(60,3)) >= 40.0")
                  find_issues_with_query(query)
                end
                def test_operator_lesser_than
                  query = Query.new(:project => Project.find(1), :name => '_')
                  query.add_filter('done_ratio', '<=', ['30'])
-                 assert query.statement.include?("#{Issue.table_name}.done_ratio <= 30")
+                 assert query.statement.include?("#{Issue.table_name}.done_ratio <= 30.0")
                  find_issues_with_query(query)
                end
                def test_operator_lesser_than_on_custom_field
                  f = IssueCustomField.create!(:name => 'filter', :field_format => 'int', :is_filter => true, :is_for_all => true)
                  query = Query.new(:project => Project.find(1), :name => '_')
                  query.add_filter("cf_#{f.id}", '<=', ['30'])
-                 assert query.statement.include?("CAST(custom_values.value AS decimal(60,3)) <= 30")
+                 assert query.statement.include?("CAST(custom_values.value AS decimal(60,3)) <= 30.0")
                  find_issues_with_query(query)
                end
                def test_operator_between
                  query = Query.new(:project => Project.find(1), :name => '_')
                  query.add_filter('done_ratio', '><', ['30', '40'])
-                 assert_include "#{Issue.table_name}.done_ratio BETWEEN 30 AND 40", query.statement
+                 assert_include "#{Issue.table_name}.done_ratio BETWEEN 30.0 AND 40.0", query.statement
                  find_issues_with_query(query)
                end
                def test_operator_between_on_custom_field
                  f = IssueCustomField.create!(:name => 'filter', :field_format => 'int', :is_filter => true, :is_for_all => true)
                  query = Query.new(:project => Project.find(1), :name => '_')
                  query.add_filter("cf_#{f.id}", '><', ['30', '40'])
-                 assert_include "CAST(custom_values.value AS decimal(60,3)) BETWEEN 30 AND 40", query.statement
+                 assert_include "CAST(custom_values.value AS decimal(60,3)) BETWEEN 30.0 AND 40.0", query.statement
                  find_issues_with_query(query)
                end
                def test_operator_date_equals
                  query = Query.new(:name => '_')
                  query.add_filter('due_date', '=', ['2011-07-10'])
                  assert_match /issues\.due_date > '2011-07-09 23:59:59(\.9+)?' AND issues\.due_date <= '2011-07-10 23:59:59(\.9+)?/, query.statement
                  find_issues_with_query(query)
                end
                def test_operator_date_lesser_than
                  query = Query.new(:name => '_')
                  query.add_filter('due_date', '<=', ['2011-07-10'])
                  assert_match /issues\.due_date <= '2011-07-10 23:59:59(\.9+)?/, query.statement
                  find_issues_with_query(query)
                end
                def test_operator_date_greater_than
                  query = Query.new(:name => '_')
                  query.add_filter('due_date', '>=', ['2011-07-10'])
                  assert_match /issues\.due_date > '2011-07-09 23:59:59(\.9+)?'/, query.statement
                  find_issues_with_query(query)
                end
                def test_operator_date_between
                  query = Query.new(:name => '_')
                  query.add_filter('due_date', '><', ['2011-06-23', '2011-07-10'])
                  assert_match /issues\.due_date > '2011-06-22 23:59:59(\.9+)?' AND issues\.due_date <= '2011-07-10 23:59:59(\.9+)?/, query.statement
                  find_issues_with_query(query)
                end
                def test_operator_in_more_than
                  Issue.find(7).update_attribute(:due_date, (Date.today + 15))
                  query = Query.new(:project => Project.find(1), :name => '_')
                  query.add_filter('due_date', '>t+', ['15'])
                  issues = find_issues_with_query(query)
                  assert !issues.empty?
                  issues.each {|issue| assert(issue.due_date >= (Date.today + 15))}
                end
                def test_operator_in_less_than
                  query = Query.new(:project => Project.find(1), :name => '_')
                  query.add_filter('due_date', '<t+', ['15'])
                  issues = find_issues_with_query(query)
                  assert !issues.empty?
                  issues.each {|issue| assert(issue.due_date >= Date.today && issue.due_date <= (Date.today + 15))}
                end
                def test_operator_less_than_ago
                  Issue.find(7).update_attribute(:due_date, (Date.today - 3))
                  query = Query.new(:project => Project.find(1), :name => '_')
                  query.add_filter('due_date', '>t-', ['3'])
                  issues = find_issues_with_query(query)
                  assert !issues.empty?
                  issues.each {|issue| assert(issue.due_date >= (Date.today - 3) && issue.due_date <= Date.today)}
                end
                def test_operator_more_than_ago
                  Issue.find(7).update_attribute(:due_date, (Date.today - 10))
                  query = Query.new(:project => Project.find(1), :name => '_')
                  query.add_filter('due_date', '<t-', ['10'])
                  assert query.statement.include?("#{Issue.table_name}.due_date <=")
                  issues = find_issues_with_query(query)
                  assert !issues.empty?
                  issues.each {|issue| assert(issue.due_date <= (Date.today - 10))}
                end
                def test_operator_in
                  Issue.find(7).update_attribute(:due_date, (Date.today + 2))
                  query = Query.new(:project => Project.find(1), :name => '_')
                  query.add_filter('due_date', 't+', ['2'])
                  issues = find_issues_with_query(query)
                  assert !issues.empty?
                  issues.each {|issue| assert_equal((Date.today + 2), issue.due_date)}
                end
                def test_operator_ago
                  Issue.find(7).update_attribute(:due_date, (Date.today - 3))
                  query = Query.new(:project => Project.find(1), :name => '_')
                  query.add_filter('due_date', 't-', ['3'])
                  issues = find_issues_with_query(query)
                  assert !issues.empty?
                  issues.each {|issue| assert_equal((Date.today - 3), issue.due_date)}
                end
                def test_operator_today
                  query = Query.new(:project => Project.find(1), :name => '_')
                  query.add_filter('due_date', 't', [''])
                  issues = find_issues_with_query(query)
                  assert !issues.empty?
                  issues.each {|issue| assert_equal Date.today, issue.due_date}
                end
                def test_operator_this_week_on_date
                  query = Query.new(:project => Project.find(1), :name => '_')
                  query.add_filter('due_date', 'w', [''])
                  find_issues_with_query(query)
                end
                def test_operator_this_week_on_datetime
                  query = Query.new(:project => Project.find(1), :name => '_')
                  query.add_filter('created_on', 'w', [''])
                  find_issues_with_query(query)
                end
                def test_operator_contains
                  query = Query.new(:project => Project.find(1), :name => '_')
                  query.add_filter('subject', '~', ['uNable'])
                  assert query.statement.include?("LOWER(#{Issue.table_name}.subject) LIKE '%unable%'")
                  result = find_issues_with_query(query)
                  assert result.empty?
                  result.each {|issue| assert issue.subject.downcase.include?('unable') }
                end
                def test_range_for_this_week_with_week_starting_on_monday
                  I18n.locale = :fr
                  assert_equal '1', I18n.t(:general_first_day_of_week)
                  Date.stubs(:today).returns(Date.parse('2011-04-29'))
                  query = Query.new(:project => Project.find(1), :name => '_')
                  query.add_filter('due_date', 'w', [''])
                  assert query.statement.match(/issues\.due_date > '2011-04-24 23:59:59(\.9+)?' AND issues\.due_date <= '2011-05-01 23:59:59(\.9+)?/), "range not found in #{query.statement}"
                  I18n.locale = :en
                end
                def test_range_for_this_week_with_week_starting_on_sunday
                  I18n.locale = :en
                  assert_equal '7', I18n.t(:general_first_day_of_week)
                  Date.stubs(:today).returns(Date.parse('2011-04-29'))
                  query = Query.new(:project => Project.find(1), :name => '_')
                  query.add_filter('due_date', 'w', [''])
                  assert query.statement.match(/issues\.due_date > '2011-04-23 23:59:59(\.9+)?' AND issues\.due_date <= '2011-04-30 23:59:59(\.9+)?/), "range not found in #{query.statement}"
                end
                def test_operator_does_not_contains
                  query = Query.new(:project => Project.find(1), :name => '_')
                  query.add_filter('subject', '!~', ['uNable'])
                  assert query.statement.include?("LOWER(#{Issue.table_name}.subject) NOT LIKE '%unable%'")
                  find_issues_with_query(query)
                end
                def test_filter_watched_issues
                  User.current = User.find(1)
                  query = Query.new(:name => '_', :filters => { 'watcher_id' => {:operator => '=', :values => ['me']}})
                  result = find_issues_with_query(query)
                  assert_not_nil result
                  assert !result.empty?
                  assert_equal Issue.visible.watched_by(User.current).sort_by(&:id), result.sort_by(&:id)
                  User.current = nil
                end
                def test_filter_unwatched_issues
                  User.current = User.find(1)
                  query = Query.new(:name => '_', :filters => { 'watcher_id' => {:operator => '!', :values => ['me']}})
                  result = find_issues_with_query(query)
                  assert_not_nil result
                  assert !result.empty?
                  assert_equal((Issue.visible - Issue.watched_by(User.current)).sort_by(&:id).size, result.sort_by(&:id).size)
                  User.current = nil
                end
                def test_statement_should_be_nil_with_no_filters
                  q = Query.new(:name => '_')
                  q.filters = {}
                  assert q.valid?
                  assert_nil q.statement
                end
                def test_default_columns
                  q = Query.new
                  assert !q.columns.empty?
                end
                def test_set_column_names
                  q = Query.new
                  q.column_names = ['tracker', :subject, '', 'unknonw_column']
                  assert_equal [:tracker, :subject], q.columns.collect {|c| c.name}
                  c = q.columns.first
                  assert q.has_column?(c)
                end
                def test_groupable_columns_should_include_custom_fields
                  q = Query.new
                  assert q.groupable_columns.detect {|c| c.is_a? QueryCustomFieldColumn}
                end
                def test_grouped_with_valid_column
                  q = Query.new(:group_by => 'status')
                  assert q.grouped?
                  assert_not_nil q.group_by_column
                  assert_equal :status, q.group_by_column.name
                  assert_not_nil q.group_by_statement
                  assert_equal 'status', q.group_by_statement
                end
                def test_grouped_with_invalid_column
                  q = Query.new(:group_by => 'foo')
                  assert !q.grouped?
                  assert_nil q.group_by_column
                  assert_nil q.group_by_statement
                end
                def test_default_sort
                  q = Query.new
                  assert_equal [], q.sort_criteria
                end
                def test_set_sort_criteria_with_hash
                  q = Query.new
                  q.sort_criteria = {'0' => ['priority', 'desc'], '2' => ['tracker']}
                  assert_equal [['priority', 'desc'], ['tracker', 'asc']], q.sort_criteria
                end
                def test_set_sort_criteria_with_array
                  q = Query.new
                  q.sort_criteria = [['priority', 'desc'], 'tracker']
                  assert_equal [['priority', 'desc'], ['tracker', 'asc']], q.sort_criteria
                end
                def test_create_query_with_sort
                  q = Query.new(:name => 'Sorted')
                  q.sort_criteria = [['priority', 'desc'], 'tracker']
                  assert q.save
                  q.reload
                  assert_equal [['priority', 'desc'], ['tracker', 'asc']], q.sort_criteria
                end
                def test_sort_by_string_custom_field_asc
                  q = Query.new
                  c = q.available_columns.find {|col| col.is_a?(QueryCustomFieldColumn) && col.custom_field.field_format == 'string' }
                  assert c
                  assert c.sortable
                  issues = Issue.find :all,
                                      :include => [ :assigned_to, :status, :tracker, :project, :priority ],
                                      :conditions => q.statement,
                                      :order => "#{c.sortable} ASC"
                  values = issues.collect {|i| i.custom_value_for(c.custom_field).to_s}
                  assert !values.empty?
                  assert_equal values.sort, values
                end
                def test_sort_by_string_custom_field_desc
                  q = Query.new
                  c = q.available_columns.find {|col| col.is_a?(QueryCustomFieldColumn) && col.custom_field.field_format == 'string' }
                  assert c
                  assert c.sortable
                  issues = Issue.find :all,
                                      :include => [ :assigned_to, :status, :tracker, :project, :priority ],
                                      :conditions => q.statement,
                                      :order => "#{c.sortable} DESC"
                  values = issues.collect {|i| i.custom_value_for(c.custom_field).to_s}
                  assert !values.empty?
                  assert_equal values.sort.reverse, values
                end
                def test_sort_by_float_custom_field_asc
                  q = Query.new
                  c = q.available_columns.find {|col| col.is_a?(QueryCustomFieldColumn) && col.custom_field.field_format == 'float' }
                  assert c
                  assert c.sortable
                  issues = Issue.find :all,
                                      :include => [ :assigned_to, :status, :tracker, :project, :priority ],
                                      :conditions => q.statement,
                                      :order => "#{c.sortable} ASC"
                  values = issues.collect {|i| begin; Kernel.Float(i.custom_value_for(c.custom_field).to_s); rescue; nil; end}.compact
                  assert !values.empty?
                  assert_equal values.sort, values
                end
                def test_invalid_query_should_raise_query_statement_invalid_error
                  q = Query.new
                  assert_raise Query::StatementInvalid do
                    q.issues(:conditions => "foo = 1")
                  end
                end
                def test_issue_count_by_association_group
                  q = Query.new(:name => '_', :group_by => 'assigned_to')
                  count_by_group = q.issue_count_by_group
                  assert_kind_of Hash, count_by_group
                  assert_equal %w(NilClass User), count_by_group.keys.collect {|k| k.class.name}.uniq.sort
                  assert_equal %w(Fixnum), count_by_group.values.collect {|k| k.class.name}.uniq
                  assert count_by_group.has_key?(User.find(3))
                end
                def test_issue_count_by_list_custom_field_group
                  q = Query.new(:name => '_', :group_by => 'cf_1')
                  count_by_group = q.issue_count_by_group
                  assert_kind_of Hash, count_by_group
                  assert_equal %w(NilClass String), count_by_group.keys.collect {|k| k.class.name}.uniq.sort
                  assert_equal %w(Fixnum), count_by_group.values.collect {|k| k.class.name}.uniq
                  assert count_by_group.has_key?('MySQL')
                end
                def test_issue_count_by_date_custom_field_group
                  q = Query.new(:name => '_', :group_by => 'cf_8')
                  count_by_group = q.issue_count_by_group
                  assert_kind_of Hash, count_by_group
                  assert_equal %w(Date NilClass), count_by_group.keys.collect {|k| k.class.name}.uniq.sort
                  assert_equal %w(Fixnum), count_by_group.values.collect {|k| k.class.name}.uniq
                end
                def test_label_for
                  q = Query.new
                  assert_equal 'assigned_to', q.label_for('assigned_to_id')
                end
                def test_editable_by
                  admin = User.find(1)
                  manager = User.find(2)
                  developer = User.find(3)
                  # Public query on project 1
                  q = Query.find(1)
                  assert q.editable_by?(admin)
                  assert q.editable_by?(manager)
                  assert !q.editable_by?(developer)
                  # Private query on project 1
                  q = Query.find(2)
                  assert q.editable_by?(admin)
                  assert !q.editable_by?(manager)
                  assert q.editable_by?(developer)
                  # Private query for all projects
                  q = Query.find(3)
                  assert q.editable_by?(admin)
                  assert !q.editable_by?(manager)
                  assert q.editable_by?(developer)
                  # Public query for all projects
                  q = Query.find(4)
                  assert q.editable_by?(admin)
                  assert !q.editable_by?(manager)
                  assert !q.editable_by?(developer)
                end
                def test_visible_scope
                  query_ids = Query.visible(User.anonymous).map(&:id)
                  assert query_ids.include?(1), 'public query on public project was not visible'
                  assert query_ids.include?(4), 'public query for all projects was not visible'
                  assert !query_ids.include?(2), 'private query on public project was visible'
                  assert !query_ids.include?(3), 'private query for all projects was visible'
                  assert !query_ids.include?(7), 'public query on private project was visible'
                end
                context "#available_filters" do
                  setup do
                    @query = Query.new(:name => "_")
                  end
                  should "include users of visible projects in cross-project view" do
                    users = @query.available_filters["assigned_to_id"]
                    assert_not_nil users
                    assert users[:values].map{|u|u[1]}.include?("3")
                  end
                  should "include visible projects in cross-project view" do
                    projects = @query.available_filters["project_id"]
                    assert_not_nil projects
                    assert projects[:values].map{|u|u[1]}.include?("1")
                  end
                  context "'member_of_group' filter" do
                    should "be present" do
                      assert @query.available_filters.keys.include?("member_of_group")
                    end
                    should "be an optional list" do
                      assert_equal :list_optional, @query.available_filters["member_of_group"][:type]
                    end
                    should "have a list of the groups as values" do
                      Group.destroy_all # No fixtures
                      group1 = Group.generate!.reload
                      group2 = Group.generate!.reload
                      expected_group_list = [
                                             [group1.name, group1.id.to_s],
                                             [group2.name, group2.id.to_s]
                                            ]
                      assert_equal expected_group_list.sort, @query.available_filters["member_of_group"][:values].sort
                    end
                  end
                  context "'assigned_to_role' filter" do
                    should "be present" do
                      assert @query.available_filters.keys.include?("assigned_to_role")
                    end
                    should "be an optional list" do
                      assert_equal :list_optional, @query.available_filters["assigned_to_role"][:type]
                    end
                    should "have a list of the Roles as values" do
                      assert @query.available_filters["assigned_to_role"][:values].include?(['Manager','1'])
                      assert @query.available_filters["assigned_to_role"][:values].include?(['Developer','2'])
                      assert @query.available_filters["assigned_to_role"][:values].include?(['Reporter','3'])
                    end
                    should "not include the built in Roles as values" do
                      assert ! @query.available_filters["assigned_to_role"][:values].include?(['Non member','4'])
                      assert ! @query.available_filters["assigned_to_role"][:values].include?(['Anonymous','5'])
                    end
                  end
                end
                context "#statement" do
                  context "with 'member_of_group' filter" do
                    setup do
                      Group.destroy_all # No fixtures
                      @user_in_group = User.generate!
                      @second_user_in_group = User.generate!
                      @user_in_group2 = User.generate!
                      @user_not_in_group = User.generate!
                      @group = Group.generate!.reload
                      @group.users << @user_in_group
                      @group.users << @second_user_in_group
                      @group2 = Group.generate!.reload
                      @group2.users << @user_in_group2
                    end
                    should "search assigned to for users in the group" do
                      @query = Query.new(:name => '_')
                      @query.add_filter('member_of_group', '=', [@group.id.to_s])
                      assert_query_statement_includes @query, "#{Issue.table_name}.assigned_to_id IN ('#{@user_in_group.id}','#{@second_user_in_group.id}')"
                      assert_find_issues_with_query_is_successful @query
                    end
                    should "search not assigned to any group member (none)" do
                      @query = Query.new(:name => '_')
                      @query.add_filter('member_of_group', '!*', [''])
                      # Users not in a group
                      assert_query_statement_includes @query, "#{Issue.table_name}.assigned_to_id IS NULL OR #{Issue.table_name}.assigned_to_id NOT IN ('#{@user_in_group.id}','#{@second_user_in_group.id}','#{@user_in_group2.id}')"
                      assert_find_issues_with_query_is_successful @query
                    end
                    should "search assigned to any group member (all)" do
                      @query = Query.new(:name => '_')
                      @query.add_filter('member_of_group', '*', [''])
                      # Only users in a group
                      assert_query_statement_includes @query, "#{Issue.table_name}.assigned_to_id IN ('#{@user_in_group.id}','#{@second_user_in_group.id}','#{@user_in_group2.id}')"
                      assert_find_issues_with_query_is_successful @query
                    end
                    should "return an empty set with = empty group" do
                      @empty_group = Group.generate!
                      @query = Query.new(:name => '_')
                      @query.add_filter('member_of_group', '=', [@empty_group.id.to_s])
                      assert_equal [], find_issues_with_query(@query)
                    end
                    should "return issues with ! empty group" do
                      @empty_group = Group.generate!
                      @query = Query.new(:name => '_')
                      @query.add_filter('member_of_group', '!', [@empty_group.id.to_s])
                      assert_find_issues_with_query_is_successful @query
                    end
                  end
                  context "with 'assigned_to_role' filter" do
                    setup do
                      # No fixtures
                      MemberRole.delete_all
                      Member.delete_all
                      Role.delete_all
                      @manager_role = Role.generate!(:name => 'Manager')
                      @developer_role = Role.generate!(:name => 'Developer')
                      @project = Project.generate!
                      @manager = User.generate!
                      @developer = User.generate!
                      @boss = User.generate!
                      User.add_to_project(@manager, @project, @manager_role)
                      User.add_to_project(@developer, @project, @developer_role)
                      User.add_to_project(@boss, @project, [@manager_role, @developer_role])
                    end
                    should "search assigned to for users with the Role" do
                      @query = Query.new(:name => '_')
                      @query.add_filter('assigned_to_role', '=', [@manager_role.id.to_s])
                      assert_query_statement_includes @query, "#{Issue.table_name}.assigned_to_id IN ('#{@manager.id}','#{@boss.id}')"
                      assert_find_issues_with_query_is_successful @query
                    end
                    should "search assigned to for users not assigned to any Role (none)" do
                      @query = Query.new(:name => '_')
                      @query.add_filter('assigned_to_role', '!*', [''])
                      assert_query_statement_includes @query, "#{Issue.table_name}.assigned_to_id IS NULL OR #{Issue.table_name}.assigned_to_id NOT IN ('#{@manager.id}','#{@developer.id}','#{@boss.id}')"
                      assert_find_issues_with_query_is_successful @query
                    end
                    should "search assigned to for users assigned to any Role (all)" do
                      @query = Query.new(:name => '_')
                      @query.add_filter('assigned_to_role', '*', [''])
                      assert_query_statement_includes @query, "#{Issue.table_name}.assigned_to_id IN ('#{@manager.id}','#{@developer.id}','#{@boss.id}')"
                      assert_find_issues_with_query_is_successful @query
                    end
                    should "return an empty set with empty role" do
                      @empty_role = Role.generate!
                      @query = Query.new(:name => '_')
                      @query.add_filter('assigned_to_role', '=', [@empty_role.id.to_s])
                      assert_equal [], find_issues_with_query(@query)
                    end
                    should "return issues with ! empty role" do
                      @empty_role = Role.generate!
                      @query = Query.new(:name => '_')
                      @query.add_filter('member_of_group', '!', [@empty_role.id.to_s])
                      assert_find_issues_with_query_is_successful @query
                    end
                  end
                end
              end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages