jro_apps/redmine Commit - r10737:ab066317e62b

Adds STI to Query model. Issue queries are now IssueQuery instances....

Jean-Philippe Lang -

r10737:ab066317e62b

parent child

Context file:

r10737:ab066317e62b

Collapse all files

app/models/issue_query.rb created 644 +321 0

@@ -0,0 +1,321
	1	# Redmine - project management software
	2	# Copyright (C) 2006-2012 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	class IssueQuery < Query
	19
	20	self.available_columns = [
	21	QueryColumn.new(:project, :sortable => "#{Project.table_name}.name", :groupable => true),
	22	QueryColumn.new(:tracker, :sortable => "#{Tracker.table_name}.position", :groupable => true),
	23	QueryColumn.new(:parent, :sortable => ["#{Issue.table_name}.root_id", "#{Issue.table_name}.lft ASC"], :default_order => 'desc', :caption => :field_parent_issue),
	24	QueryColumn.new(:status, :sortable => "#{IssueStatus.table_name}.position", :groupable => true),
	25	QueryColumn.new(:priority, :sortable => "#{IssuePriority.table_name}.position", :default_order => 'desc', :groupable => true),
	26	QueryColumn.new(:subject, :sortable => "#{Issue.table_name}.subject"),
	27	QueryColumn.new(:author, :sortable => lambda {User.fields_for_order_statement("authors")}, :groupable => true),
	28	QueryColumn.new(:assigned_to, :sortable => lambda {User.fields_for_order_statement}, :groupable => true),
	29	QueryColumn.new(:updated_on, :sortable => "#{Issue.table_name}.updated_on", :default_order => 'desc'),
	30	QueryColumn.new(:category, :sortable => "#{IssueCategory.table_name}.name", :groupable => true),
	31	QueryColumn.new(:fixed_version, :sortable => lambda {Version.fields_for_order_statement}, :groupable => true),
	32	QueryColumn.new(:start_date, :sortable => "#{Issue.table_name}.start_date"),
	33	QueryColumn.new(:due_date, :sortable => "#{Issue.table_name}.due_date"),
	34	QueryColumn.new(:estimated_hours, :sortable => "#{Issue.table_name}.estimated_hours"),
	35	QueryColumn.new(:done_ratio, :sortable => "#{Issue.table_name}.done_ratio", :groupable => true),
	36	QueryColumn.new(:created_on, :sortable => "#{Issue.table_name}.created_on", :default_order => 'desc'),
	37	QueryColumn.new(:relations, :caption => :label_related_issues),
	38	QueryColumn.new(:description, :inline => false)
	39	]
	40
	41	scope :visible, lambda {\|*args\|
	42	user = args.shift \|\| User.current
	43	base = Project.allowed_to_condition(user, :view_issues, *args)
	44	user_id = user.logged? ? user.id : 0
	45
	46	includes(:project).where("(#{table_name}.project_id IS NULL OR (#{base})) AND (#{table_name}.is_public = ? OR #{table_name}.user_id = ?)", true, user_id)
	47	}
	48
	49	def initialize(attributes=nil, *args)
	50	super attributes
	51	self.filters \|\|= { 'status_id' => {:operator => "o", :values => [""]} }
	52	end
	53
	54	# Returns true if the query is visible to +user+ or the current user.
	55	def visible?(user=User.current)
	56	(project.nil? \|\| user.allowed_to?(:view_issues, project)) && (self.is_public? \|\| self.user_id == user.id)
	57	end
	58
	59	def available_filters
	60	return @available_filters if @available_filters
	61	@available_filters = {
	62	"status_id" => {
	63	:type => :list_status, :order => 0,
	64	:values => IssueStatus.sorted.all.collect{\|s\| [s.name, s.id.to_s] }
	65	},
	66	"tracker_id" => {
	67	:type => :list, :order => 2, :values => trackers.collect{\|s\| [s.name, s.id.to_s] }
	68	},
	69	"priority_id" => {
	70	:type => :list, :order => 3, :values => IssuePriority.all.collect{\|s\| [s.name, s.id.to_s] }
	71	},
	72	"subject" => { :type => :text, :order => 8 },
	73	"created_on" => { :type => :date_past, :order => 9 },
	74	"updated_on" => { :type => :date_past, :order => 10 },
	75	"start_date" => { :type => :date, :order => 11 },
	76	"due_date" => { :type => :date, :order => 12 },
	77	"estimated_hours" => { :type => :float, :order => 13 },
	78	"done_ratio" => { :type => :integer, :order => 14 }
	79	}
	80	IssueRelation::TYPES.each do \|relation_type, options\|
	81	@available_filters[relation_type] = {
	82	:type => :relation, :order => @available_filters.size + 100,
	83	:label => options[:name]
	84	}
	85	end
	86	principals = []
	87	if project
	88	principals += project.principals.sort
	89	unless project.leaf?
	90	subprojects = project.descendants.visible.all
	91	if subprojects.any?
	92	@available_filters["subproject_id"] = {
	93	:type => :list_subprojects, :order => 13,
	94	:values => subprojects.collect{\|s\| [s.name, s.id.to_s] }
	95	}
	96	principals += Principal.member_of(subprojects)
	97	end
	98	end
	99	else
	100	if all_projects.any?
	101	# members of visible projects
	102	principals += Principal.member_of(all_projects)
	103	# project filter
	104	project_values = []
	105	if User.current.logged? && User.current.memberships.any?
	106	project_values << ["<< #{l(:label_my_projects).downcase} >>", "mine"]
	107	end
	108	project_values += all_projects_values
	109	@available_filters["project_id"] = {
	110	:type => :list, :order => 1, :values => project_values
	111	} unless project_values.empty?
	112	end
	113	end
	114	principals.uniq!
	115	principals.sort!
	116	users = principals.select {\|p\| p.is_a?(User)}
	117
	118	assigned_to_values = []
	119	assigned_to_values << ["<< #{l(:label_me)} >>", "me"] if User.current.logged?
	120	assigned_to_values += (Setting.issue_group_assignment? ?
	121	principals : users).collect{\|s\| [s.name, s.id.to_s] }
	122	@available_filters["assigned_to_id"] = {
	123	:type => :list_optional, :order => 4, :values => assigned_to_values
	124	} unless assigned_to_values.empty?
	125
	126	author_values = []
	127	author_values << ["<< #{l(:label_me)} >>", "me"] if User.current.logged?
	128	author_values += users.collect{\|s\| [s.name, s.id.to_s] }
	129	@available_filters["author_id"] = {
	130	:type => :list, :order => 5, :values => author_values
	131	} unless author_values.empty?
	132
	133	group_values = Group.all.collect {\|g\| [g.name, g.id.to_s] }
	134	@available_filters["member_of_group"] = {
	135	:type => :list_optional, :order => 6, :values => group_values
	136	} unless group_values.empty?
	137
	138	role_values = Role.givable.collect {\|r\| [r.name, r.id.to_s] }
	139	@available_filters["assigned_to_role"] = {
	140	:type => :list_optional, :order => 7, :values => role_values
	141	} unless role_values.empty?
	142
	143	if User.current.logged?
	144	@available_filters["watcher_id"] = {
	145	:type => :list, :order => 15, :values => [["<< #{l(:label_me)} >>", "me"]]
	146	}
	147	end
	148
	149	if project
	150	# project specific filters
	151	categories = project.issue_categories.all
	152	unless categories.empty?
	153	@available_filters["category_id"] = {
	154	:type => :list_optional, :order => 6,
	155	:values => categories.collect{\|s\| [s.name, s.id.to_s] }
	156	}
	157	end
	158	versions = project.shared_versions.all
	159	unless versions.empty?
	160	@available_filters["fixed_version_id"] = {
	161	:type => :list_optional, :order => 7,
	162	:values => versions.sort.collect{\|s\| ["#{s.project.name} - #{s.name}", s.id.to_s] }
	163	}
	164	end
	165	add_custom_fields_filters(project.all_issue_custom_fields)
	166	else
	167	# global filters for cross project issue list
	168	system_shared_versions = Version.visible.find_all_by_sharing('system')
	169	unless system_shared_versions.empty?
	170	@available_filters["fixed_version_id"] = {
	171	:type => :list_optional, :order => 7,
	172	:values => system_shared_versions.sort.collect{\|s\|
	173	["#{s.project.name} - #{s.name}", s.id.to_s]
	174	}
	175	}
	176	end
	177	add_custom_fields_filters(IssueCustomField.where(:is_filter => true, :is_for_all => true).all)
	178	end
	179	add_associations_custom_fields_filters :project, :author, :assigned_to, :fixed_version
	180	if User.current.allowed_to?(:set_issues_private, nil, :global => true) \|\|
	181	User.current.allowed_to?(:set_own_issues_private, nil, :global => true)
	182	@available_filters["is_private"] = {
	183	:type => :list, :order => 16,
	184	:values => [[l(:general_text_yes), "1"], [l(:general_text_no), "0"]]
	185	}
	186	end
	187	Tracker.disabled_core_fields(trackers).each {\|field\|
	188	@available_filters.delete field
	189	}
	190	@available_filters.each do \|field, options\|
	191	options[:name] \|\|= l(options[:label] \|\| "field_#{field}".gsub(/_id$/, ''))
	192	end
	193	@available_filters
	194	end
	195
	196	def available_columns
	197	return @available_columns if @available_columns
	198	@available_columns = self.class.available_columns.dup
	199	@available_columns += (project ?
	200	project.all_issue_custom_fields :
	201	IssueCustomField.all
	202	).collect {\|cf\| QueryCustomFieldColumn.new(cf) }
	203
	204	if User.current.allowed_to?(:view_time_entries, project, :global => true)
	205	index = nil
	206	@available_columns.each_with_index {\|column, i\| index = i if column.name == :estimated_hours}
	207	index = (index ? index + 1 : -1)
	208	# insert the column after estimated_hours or at the end
	209	@available_columns.insert index, QueryColumn.new(:spent_hours,
	210	:sortable => "(SELECT COALESCE(SUM(hours), 0) FROM #{TimeEntry.table_name} WHERE #{TimeEntry.table_name}.issue_id = #{Issue.table_name}.id)",
	211	:default_order => 'desc',
	212	:caption => :label_spent_time
	213	)
	214	end
	215
	216	if User.current.allowed_to?(:set_issues_private, nil, :global => true) \|\|
	217	User.current.allowed_to?(:set_own_issues_private, nil, :global => true)
	218	@available_columns << QueryColumn.new(:is_private, :sortable => "#{Issue.table_name}.is_private")
	219	end
	220
	221	disabled_fields = Tracker.disabled_core_fields(trackers).map {\|field\| field.sub(/_id$/, '')}
	222	@available_columns.reject! {\|column\|
	223	disabled_fields.include?(column.name.to_s)
	224	}
	225
	226	@available_columns
	227	end
	228
	229	# Returns the issue count
	230	def issue_count
	231	Issue.visible.count(:include => [:status, :project], :conditions => statement)
	232	rescue ::ActiveRecord::StatementInvalid => e
	233	raise StatementInvalid.new(e.message)
	234	end
	235
	236	# Returns the issue count by group or nil if query is not grouped
	237	def issue_count_by_group
	238	r = nil
	239	if grouped?
	240	begin
	241	# Rails3 will raise an (unexpected) RecordNotFound if there's only a nil group value
	242	r = Issue.visible.count(:group => group_by_statement, :include => [:status, :project], :conditions => statement)
	243	rescue ActiveRecord::RecordNotFound
	244	r = {nil => issue_count}
	245	end
	246	c = group_by_column
	247	if c.is_a?(QueryCustomFieldColumn)
	248	r = r.keys.inject({}) {\|h, k\| h[c.custom_field.cast_value(k)] = r[k]; h}
	249	end
	250	end
	251	r
	252	rescue ::ActiveRecord::StatementInvalid => e
	253	raise StatementInvalid.new(e.message)
	254	end
	255
	256	# Returns the issues
	257	# Valid options are :order, :offset, :limit, :include, :conditions
	258	def issues(options={})
	259	order_option = [group_by_sort_order, options[:order]].reject {\|s\| s.blank?}.join(',')
	260	order_option = nil if order_option.blank?
	261
	262	issues = Issue.visible.where(options[:conditions]).all(
	263	:include => ([:status, :project] + (options[:include] \|\| [])).uniq,
	264	:conditions => statement,
	265	:order => order_option,
	266	:joins => joins_for_order_statement(order_option),
	267	:limit => options[:limit],
	268	:offset => options[:offset]
	269	)
	270
	271	if has_column?(:spent_hours)
	272	Issue.load_visible_spent_hours(issues)
	273	end
	274	if has_column?(:relations)
	275	Issue.load_visible_relations(issues)
	276	end
	277	issues
	278	rescue ::ActiveRecord::StatementInvalid => e
	279	raise StatementInvalid.new(e.message)
	280	end
	281
	282	# Returns the issues ids
	283	def issue_ids(options={})
	284	order_option = [group_by_sort_order, options[:order]].reject {\|s\| s.blank?}.join(',')
	285	order_option = nil if order_option.blank?
	286
	287	Issue.visible.scoped(:conditions => options[:conditions]).scoped(:include => ([:status, :project] + (options[:include] \|\| [])).uniq,
	288	:conditions => statement,
	289	:order => order_option,
	290	:joins => joins_for_order_statement(order_option),
	291	:limit => options[:limit],
	292	:offset => options[:offset]).find_ids
	293	rescue ::ActiveRecord::StatementInvalid => e
	294	raise StatementInvalid.new(e.message)
	295	end
	296
	297	# Returns the journals
	298	# Valid options are :order, :offset, :limit
	299	def journals(options={})
	300	Journal.visible.all(
	301	:include => [:details, :user, {:issue => [:project, :author, :tracker, :status]}],
	302	:conditions => statement,
	303	:order => options[:order],
	304	:limit => options[:limit],
	305	:offset => options[:offset]
	306	)
	307	rescue ::ActiveRecord::StatementInvalid => e
	308	raise StatementInvalid.new(e.message)
	309	end
	310
	311	# Returns the versions
	312	# Valid options are :conditions
	313	def versions(options={})
	314	Version.visible.where(options[:conditions]).all(
	315	:include => :project,
	316	:conditions => project_statement
	317	)
	318	rescue ::ActiveRecord::StatementInvalid => e
	319	raise StatementInvalid.new(e.message)
	320	end
	321	end

db/migrate/20121209123234_add_queries_type.rb created 644 +9 0

@@ -0,0 +1,9
	1	class AddQueriesType < ActiveRecord::Migration
	2	def up
	3	add_column :queries, :type, :string
	4	end
	5
	6	def down
	7	remove_column :queries, :type
	8	end
	9	end

db/migrate/20121209123358_update_queries_to_sti.rb created 644 +9 0

@@ -0,0 +1,9
	1	class UpdateQueriesToSti < ActiveRecord::Migration
	2	def up
	3	::Query.update_all :type => 'IssueQuery'
	4	end
	5
	6	def down
	7	::Query.update_all :type => nil
	8	end
	9	end

app/controllers/queries_controller.rb +5 -5

                   @limit = per_page_option
                 end
-                @query_count = Query.visible.count
+                @query_count = IssueQuery.visible.count
                 @query_pages = Paginator.new self, @query_count, @limit, params['page']
-                @queries = Query.visible.all(:limit => @limit, :offset => @offset, :order => "#{Query.table_name}.name")
+                @queries = IssueQuery.visible.all(:limit => @limit, :offset => @offset, :order => "#{Query.table_name}.name")
                 respond_to do |format|
                   format.html { render :nothing => true }
               end
               def new
-                @query = Query.new
+                @query = IssueQuery.new
                 @query.user = User.current
                 @query.project = @project
                 @query.is_public = false unless User.current.allowed_to?(:manage_public_queries, @project) || User.current.admin?
               end
               def create
-                @query = Query.new(params[:query])
+                @query = IssueQuery.new(params[:query])
                 @query.user = User.current
                 @query.project = params[:query_is_for_all] ? nil : @project
                 @query.is_public = false unless User.current.allowed_to?(:manage_public_queries, @project) || User.current.admin?
             private
               def find_query
-                @query = Query.find(params[:id])
+                @query = IssueQuery.find(params[:id])
                 @project = @query.project
                 render_403 unless @query.editable_by?(User.current)
               rescue ActiveRecord::RecordNotFound

app/helpers/issues_helper.rb +1 -1

               def sidebar_queries
                 unless @sidebar_queries
-                  @sidebar_queries = Query.visible.all(
+                  @sidebar_queries = IssueQuery.visible.all(
                     :order => "#{Query.table_name}.name ASC",
                     # Project specific queries and global queries
                     :conditions => (@project.nil? ? ["project_id IS NULL"] : ["project_id IS NULL OR project_id = ?", @project.id])

app/helpers/queries_helper.rb +6 -6

                 if !params[:query_id].blank?
                   cond = "project_id IS NULL"
                   cond << " OR project_id = #{@project.id}" if @project
-                  @query = Query.find(params[:query_id], :conditions => cond)
+                  @query = IssueQuery.find(params[:query_id], :conditions => cond)
                   raise ::Unauthorized unless @query.visible?
                   @query.project = @project
                   session[:query] = {:id => @query.id, :project_id => @query.project_id}
                   sort_clear
                 elsif api_request? || params[:set_filter] || session[:query].nil? || session[:query][:project_id] != (@project ? @project.id : nil)
                   # Give it a name, required to be valid
-                  @query = Query.new(:name => "_")
+                  @query = IssueQuery.new(:name => "_")
                   @query.project = @project
                   build_query_from_params
                   session[:query] = {:project_id => @query.project_id, :filters => @query.filters, :group_by => @query.group_by, :column_names => @query.column_names}
                 else
                   # retrieve from session
-                  @query = Query.find_by_id(session[:query][:id]) if session[:query][:id]
+                  @query = IssueQuery.find_by_id(session[:query][:id]) if session[:query][:id]
-                  @query ||= Query.new(:name => "_", :filters => session[:query][:filters], :group_by => session[:query][:group_by], :column_names => session[:query][:column_names])
+                  @query ||= IssueQuery.new(:name => "_", :filters => session[:query][:filters], :group_by => session[:query][:group_by], :column_names => session[:query][:column_names])
                   @query.project = @project
                 end
               end
               def retrieve_query_from_session
                 if session[:query]
                   if session[:query][:id]
-                    @query = Query.find_by_id(session[:query][:id])
+                    @query = IssueQuery.find_by_id(session[:query][:id])
                     return unless @query
                   else
-                    @query = Query.new(:name => "_", :filters => session[:query][:filters], :group_by => session[:query][:group_by], :column_names => session[:query][:column_names])
+                    @query = IssueQuery.new(:name => "_", :filters => session[:query][:filters], :group_by => session[:query][:group_by], :column_names => session[:query][:column_names])
                   end
                   if session[:query].has_key?(:project_id)
                     @query.project_id = session[:query][:project_id]

app/models/project.rb +2 -2

               has_many :issue_changes, :through => :issues, :source => :journals
               has_many :versions, :dependent => :destroy, :order => "#{Version.table_name}.effective_date DESC, #{Version.table_name}.name DESC"
               has_many :time_entries, :dependent => :delete_all
-              has_many :queries, :dependent => :delete_all
+              has_many :queries, :class_name => 'IssueQuery', :dependent => :delete_all
               has_many :documents, :dependent => :destroy
               has_many :news, :dependent => :destroy, :include => :author
               has_many :issue_categories, :dependent => :delete_all, :order => "#{IssueCategory.table_name}.name"
               # Copies queries from +project+
               def copy_queries(project)
                 project.queries.each do |query|
-                  new_query = ::Query.new
+                  new_query = IssueQuery.new
                   new_query.attributes = query.attributes.dup.except("id", "project_id", "sort_criteria")
                   new_query.sort_criteria = query.sort_criteria if query.sort_criteria
                   new_query.project = self

app/models/query.rb +1 -297

@@ -145,38 +145,10 class Query < ActiveRecord::Base
145	}	145	}
146		146
147	class_attribute :available_columns	147	class_attribute :available_columns
148	self.available_columns = [	148	self.available_columns = []
149	QueryColumn.new(:project, :sortable => "#{Project.table_name}.name", :groupable => true),
150	QueryColumn.new(:tracker, :sortable => "#{Tracker.table_name}.position", :groupable => true),
151	QueryColumn.new(:parent, :sortable => ["#{Issue.table_name}.root_id", "#{Issue.table_name}.lft ASC"], :default_order => 'desc', :caption => :field_parent_issue),
152	QueryColumn.new(:status, :sortable => "#{IssueStatus.table_name}.position", :groupable => true),
153	QueryColumn.new(:priority, :sortable => "#{IssuePriority.table_name}.position", :default_order => 'desc', :groupable => true),
154	QueryColumn.new(:subject, :sortable => "#{Issue.table_name}.subject"),
155	QueryColumn.new(:author, :sortable => lambda {User.fields_for_order_statement("authors")}, :groupable => true),
156	QueryColumn.new(:assigned_to, :sortable => lambda {User.fields_for_order_statement}, :groupable => true),
157	QueryColumn.new(:updated_on, :sortable => "#{Issue.table_name}.updated_on", :default_order => 'desc'),
158	QueryColumn.new(:category, :sortable => "#{IssueCategory.table_name}.name", :groupable => true),
159	QueryColumn.new(:fixed_version, :sortable => lambda {Version.fields_for_order_statement}, :groupable => true),
160	QueryColumn.new(:start_date, :sortable => "#{Issue.table_name}.start_date"),
161	QueryColumn.new(:due_date, :sortable => "#{Issue.table_name}.due_date"),
162	QueryColumn.new(:estimated_hours, :sortable => "#{Issue.table_name}.estimated_hours"),
163	QueryColumn.new(:done_ratio, :sortable => "#{Issue.table_name}.done_ratio", :groupable => true),
164	QueryColumn.new(:created_on, :sortable => "#{Issue.table_name}.created_on", :default_order => 'desc'),
165	QueryColumn.new(:relations, :caption => :label_related_issues),
166	QueryColumn.new(:description, :inline => false)
167	]
168
169	scope :visible, lambda {\|*args\|
170	user = args.shift \|\| User.current
171	base = Project.allowed_to_condition(user, :view_issues, *args)
172	user_id = user.logged? ? user.id : 0
173
174	includes(:project).where("(#{table_name}.project_id IS NULL OR (#{base})) AND (#{table_name}.is_public = ? OR #{table_name}.user_id = ?)", true, user_id)
175	}
176		149
177	def initialize(attributes=nil, *args)	150	def initialize(attributes=nil, *args)
178	super attributes	151	super attributes
179	self.filters \|\|= { 'status_id' => {:operator => "o", :values => [""]} }
180	@is_for_all = project.nil?	152	@is_for_all = project.nil?
181	end	153	end
182		154
@@ -211,11 +183,6 class Query < ActiveRecord::Base
211	errors.add(:base, m)	183	errors.add(:base, m)
212	end	184	end
213		185
214	# Returns true if the query is visible to +user+ or the current user.
215	def visible?(user=User.current)
216	(project.nil? \|\| user.allowed_to?(:view_issues, project)) && (self.is_public? \|\| self.user_id == user.id)
217	end
218
219	def editable_by?(user)	186	def editable_by?(user)
220	return false unless user	187	return false unless user
221	# Admin can edit them all and regular users can edit their private queries	188	# Admin can edit them all and regular users can edit their private queries
@@ -233,143 +200,6 class Query < ActiveRecord::Base
233	operators.inject({}) {\|h, operator\| h[operator.first] = l(operator.last); h}	200	operators.inject({}) {\|h, operator\| h[operator.first] = l(operator.last); h}
234	end	201	end
235		202
236	def available_filters
237	return @available_filters if @available_filters
238	@available_filters = {
239	"status_id" => {
240	:type => :list_status, :order => 0,
241	:values => IssueStatus.sorted.all.collect{\|s\| [s.name, s.id.to_s] }
242	},
243	"tracker_id" => {
244	:type => :list, :order => 2, :values => trackers.collect{\|s\| [s.name, s.id.to_s] }
245	},
246	"priority_id" => {
247	:type => :list, :order => 3, :values => IssuePriority.all.collect{\|s\| [s.name, s.id.to_s] }
248	},
249	"subject" => { :type => :text, :order => 8 },
250	"created_on" => { :type => :date_past, :order => 9 },
251	"updated_on" => { :type => :date_past, :order => 10 },
252	"start_date" => { :type => :date, :order => 11 },
253	"due_date" => { :type => :date, :order => 12 },
254	"estimated_hours" => { :type => :float, :order => 13 },
255	"done_ratio" => { :type => :integer, :order => 14 }
256	}
257	IssueRelation::TYPES.each do \|relation_type, options\|
258	@available_filters[relation_type] = {
259	:type => :relation, :order => @available_filters.size + 100,
260	:label => options[:name]
261	}
262	end
263	principals = []
264	if project
265	principals += project.principals.sort
266	unless project.leaf?
267	subprojects = project.descendants.visible.all
268	if subprojects.any?
269	@available_filters["subproject_id"] = {
270	:type => :list_subprojects, :order => 13,
271	:values => subprojects.collect{\|s\| [s.name, s.id.to_s] }
272	}
273	principals += Principal.member_of(subprojects)
274	end
275	end
276	else
277	if all_projects.any?
278	# members of visible projects
279	principals += Principal.member_of(all_projects)
280	# project filter
281	project_values = []
282	if User.current.logged? && User.current.memberships.any?
283	project_values << ["<< #{l(:label_my_projects).downcase} >>", "mine"]
284	end
285	project_values += all_projects_values
286	@available_filters["project_id"] = {
287	:type => :list, :order => 1, :values => project_values
288	} unless project_values.empty?
289	end
290	end
291	principals.uniq!
292	principals.sort!
293	users = principals.select {\|p\| p.is_a?(User)}
294
295	assigned_to_values = []
296	assigned_to_values << ["<< #{l(:label_me)} >>", "me"] if User.current.logged?
297	assigned_to_values += (Setting.issue_group_assignment? ?
298	principals : users).collect{\|s\| [s.name, s.id.to_s] }
299	@available_filters["assigned_to_id"] = {
300	:type => :list_optional, :order => 4, :values => assigned_to_values
301	} unless assigned_to_values.empty?
302
303	author_values = []
304	author_values << ["<< #{l(:label_me)} >>", "me"] if User.current.logged?
305	author_values += users.collect{\|s\| [s.name, s.id.to_s] }
306	@available_filters["author_id"] = {
307	:type => :list, :order => 5, :values => author_values
308	} unless author_values.empty?
309
310	group_values = Group.all.collect {\|g\| [g.name, g.id.to_s] }
311	@available_filters["member_of_group"] = {
312	:type => :list_optional, :order => 6, :values => group_values
313	} unless group_values.empty?
314
315	role_values = Role.givable.collect {\|r\| [r.name, r.id.to_s] }
316	@available_filters["assigned_to_role"] = {
317	:type => :list_optional, :order => 7, :values => role_values
318	} unless role_values.empty?
319
320	if User.current.logged?
321	@available_filters["watcher_id"] = {
322	:type => :list, :order => 15, :values => [["<< #{l(:label_me)} >>", "me"]]
323	}
324	end
325
326	if project
327	# project specific filters
328	categories = project.issue_categories.all
329	unless categories.empty?
330	@available_filters["category_id"] = {
331	:type => :list_optional, :order => 6,
332	:values => categories.collect{\|s\| [s.name, s.id.to_s] }
333	}
334	end
335	versions = project.shared_versions.all
336	unless versions.empty?
337	@available_filters["fixed_version_id"] = {
338	:type => :list_optional, :order => 7,
339	:values => versions.sort.collect{\|s\| ["#{s.project.name} - #{s.name}", s.id.to_s] }
340	}
341	end
342	add_custom_fields_filters(project.all_issue_custom_fields)
343	else
344	# global filters for cross project issue list
345	system_shared_versions = Version.visible.find_all_by_sharing('system')
346	unless system_shared_versions.empty?
347	@available_filters["fixed_version_id"] = {
348	:type => :list_optional, :order => 7,
349	:values => system_shared_versions.sort.collect{\|s\|
350	["#{s.project.name} - #{s.name}", s.id.to_s]
351	}
352	}
353	end
354	add_custom_fields_filters(IssueCustomField.where(:is_filter => true, :is_for_all => true).all)
355	end
356	add_associations_custom_fields_filters :project, :author, :assigned_to, :fixed_version
357	if User.current.allowed_to?(:set_issues_private, nil, :global => true) \|\|
358	User.current.allowed_to?(:set_own_issues_private, nil, :global => true)
359	@available_filters["is_private"] = {
360	:type => :list, :order => 16,
361	:values => [[l(:general_text_yes), "1"], [l(:general_text_no), "0"]]
362	}
363	end
364	Tracker.disabled_core_fields(trackers).each {\|field\|
365	@available_filters.delete field
366	}
367	@available_filters.each do \|field, options\|
368	options[:name] \|\|= l(options[:label] \|\| "field_#{field}".gsub(/_id$/, ''))
369	end
370	@available_filters
371	end
372
373	# Returns a representation of the available filters for JSON serialization	203	# Returns a representation of the available filters for JSON serialization
374	def available_filters_as_json	204	def available_filters_as_json
375	json = {}	205	json = {}
@@ -447,39 +277,6 class Query < ActiveRecord::Base
447	label \|\|= l("field_#{field.to_s.gsub(/_id$/, '')}", :default => field)	277	label \|\|= l("field_#{field.to_s.gsub(/_id$/, '')}", :default => field)
448	end	278	end
449		279
450	def available_columns
451	return @available_columns if @available_columns
452	@available_columns = ::Query.available_columns.dup
453	@available_columns += (project ?
454	project.all_issue_custom_fields :
455	IssueCustomField.all
456	).collect {\|cf\| QueryCustomFieldColumn.new(cf) }
457
458	if User.current.allowed_to?(:view_time_entries, project, :global => true)
459	index = nil
460	@available_columns.each_with_index {\|column, i\| index = i if column.name == :estimated_hours}
461	index = (index ? index + 1 : -1)
462	# insert the column after estimated_hours or at the end
463	@available_columns.insert index, QueryColumn.new(:spent_hours,
464	:sortable => "(SELECT COALESCE(SUM(hours), 0) FROM #{TimeEntry.table_name} WHERE #{TimeEntry.table_name}.issue_id = #{Issue.table_name}.id)",
465	:default_order => 'desc',
466	:caption => :label_spent_time
467	)
468	end
469
470	if User.current.allowed_to?(:set_issues_private, nil, :global => true) \|\|
471	User.current.allowed_to?(:set_own_issues_private, nil, :global => true)
472	@available_columns << QueryColumn.new(:is_private, :sortable => "#{Issue.table_name}.is_private")
473	end
474
475	disabled_fields = Tracker.disabled_core_fields(trackers).map {\|field\| field.sub(/_id$/, '')}
476	@available_columns.reject! {\|column\|
477	disabled_fields.include?(column.name.to_s)
478	}
479
480	@available_columns
481	end
482
483	def self.add_available_column(column)	280	def self.add_available_column(column)
484	self.available_columns << (column) if column.is_a?(QueryColumn)	281	self.available_columns << (column) if column.is_a?(QueryColumn)
485	end	282	end
@@ -666,99 +463,6 class Query < ActiveRecord::Base
666	filters_clauses.any? ? filters_clauses.join(' AND ') : nil	463	filters_clauses.any? ? filters_clauses.join(' AND ') : nil
667	end	464	end
668		465
669	# Returns the issue count
670	def issue_count
671	Issue.visible.count(:include => [:status, :project], :conditions => statement)
672	rescue ::ActiveRecord::StatementInvalid => e
673	raise StatementInvalid.new(e.message)
674	end
675
676	# Returns the issue count by group or nil if query is not grouped
677	def issue_count_by_group
678	r = nil
679	if grouped?
680	begin
681	# Rails3 will raise an (unexpected) RecordNotFound if there's only a nil group value
682	r = Issue.visible.count(:group => group_by_statement, :include => [:status, :project], :conditions => statement)
683	rescue ActiveRecord::RecordNotFound
684	r = {nil => issue_count}
685	end
686	c = group_by_column
687	if c.is_a?(QueryCustomFieldColumn)
688	r = r.keys.inject({}) {\|h, k\| h[c.custom_field.cast_value(k)] = r[k]; h}
689	end
690	end
691	r
692	rescue ::ActiveRecord::StatementInvalid => e
693	raise StatementInvalid.new(e.message)
694	end
695
696	# Returns the issues
697	# Valid options are :order, :offset, :limit, :include, :conditions
698	def issues(options={})
699	order_option = [group_by_sort_order, options[:order]].reject {\|s\| s.blank?}.join(',')
700	order_option = nil if order_option.blank?
701
702	issues = Issue.visible.where(options[:conditions]).all(
703	:include => ([:status, :project] + (options[:include] \|\| [])).uniq,
704	:conditions => statement,
705	:order => order_option,
706	:joins => joins_for_order_statement(order_option),
707	:limit => options[:limit],
708	:offset => options[:offset]
709	)
710
711	if has_column?(:spent_hours)
712	Issue.load_visible_spent_hours(issues)
713	end
714	if has_column?(:relations)
715	Issue.load_visible_relations(issues)
716	end
717	issues
718	rescue ::ActiveRecord::StatementInvalid => e
719	raise StatementInvalid.new(e.message)
720	end
721
722	# Returns the issues ids
723	def issue_ids(options={})
724	order_option = [group_by_sort_order, options[:order]].reject {\|s\| s.blank?}.join(',')
725	order_option = nil if order_option.blank?
726
727	Issue.visible.scoped(:conditions => options[:conditions]).scoped(:include => ([:status, :project] + (options[:include] \|\| [])).uniq,
728	:conditions => statement,
729	:order => order_option,
730	:joins => joins_for_order_statement(order_option),
731	:limit => options[:limit],
732	:offset => options[:offset]).find_ids
733	rescue ::ActiveRecord::StatementInvalid => e
734	raise StatementInvalid.new(e.message)
735	end
736
737	# Returns the journals
738	# Valid options are :order, :offset, :limit
739	def journals(options={})
740	Journal.visible.all(
741	:include => [:details, :user, {:issue => [:project, :author, :tracker, :status]}],
742	:conditions => statement,
743	:order => options[:order],
744	:limit => options[:limit],
745	:offset => options[:offset]
746	)
747	rescue ::ActiveRecord::StatementInvalid => e
748	raise StatementInvalid.new(e.message)
749	end
750
751	# Returns the versions
752	# Valid options are :conditions
753	def versions(options={})
754	Version.visible.where(options[:conditions]).all(
755	:include => :project,
756	:conditions => project_statement
757	)
758	rescue ::ActiveRecord::StatementInvalid => e
759	raise StatementInvalid.new(e.message)
760	end
761
762	def sql_for_watcher_id_field(field, operator, value)	466	def sql_for_watcher_id_field(field, operator, value)
763	db_table = Watcher.table_name	467	db_table = Watcher.table_name
764	"#{Issue.table_name}.id #{ operator == '=' ? 'IN' : 'NOT IN' } (SELECT #{db_table}.watchable_id FROM #{db_table} WHERE #{db_table}.watchable_type='Issue' AND " +	468	"#{Issue.table_name}.id #{ operator == '=' ? 'IN' : 'NOT IN' } (SELECT #{db_table}.watchable_id FROM #{db_table} WHERE #{db_table}.watchable_type='Issue' AND " +

app/views/settings/_issues.html.erb +1 -1

             	<legend><%= l(:setting_issue_list_default_columns) %></legend>
               <%= render :partial => 'queries/columns',
                          :locals => {
-                           :query => Query.new(:column_names => Setting.issue_list_default_columns),
+                           :query => IssueQuery.new(:column_names => Setting.issue_list_default_columns),
                            :tag_name => 'settings[issue_list_default_columns][]'
                          } %>
             </fieldset>

test/fixtures/queries.yml +9 0

             ---
             queries_001:
               id: 1
+              type: IssueQuery
               project_id: 1
               is_public: true
               name: Multiple custom fields query
               column_names:
             queries_002:
               id: 2
+              type: IssueQuery
               project_id: 1
               is_public: false
               name: Private query for cookbook
               column_names:
             queries_003:
               id: 3
+              type: IssueQuery
               project_id:
               is_public: false
               name: Private query for all projects
               column_names:
             queries_004:
               id: 4
+              type: IssueQuery
               project_id:
               is_public: true
               name: Public query for all projects
               column_names:
             queries_005:
               id: 5
+              type: IssueQuery
               project_id:
               is_public: true
               name: Open issues by priority and tracker
                   - asc
             queries_006:
               id: 6
+              type: IssueQuery
               project_id:
               is_public: true
               name: Open issues grouped by tracker
                   - desc
             queries_007:
               id: 7
+              type: IssueQuery
               project_id: 2
               is_public: true
               name: Public query for project 2
               column_names:
             queries_008:
               id: 8
+              type: IssueQuery
               project_id: 2
               is_public: false
               name: Private query for project 2
               column_names:
             queries_009:
               id: 9
+              type: IssueQuery
               project_id:
               is_public: true
               name: Open issues grouped by list custom field

test/functional/calendars_controller_test.rb +1 -1

               context "GET :show" do
                 should "run custom queries" do
-                  @query = Query.create!(:name => 'Calendar', :is_public => true)
+                  @query = IssueQuery.create!(:name => 'Calendar', :is_public => true)
                   get :show, :query_id => @query.id
                   assert_response :success

test/functional/issues_controller_test.rb +10 -10

               end
               def test_index_with_cross_project_query_in_session_should_show_project_issues
-                q = Query.create!(:name => "test", :user_id => 2, :is_public => false, :project => nil)
+                q = IssueQuery.create!(:name => "test", :user_id => 2, :is_public => false, :project => nil)
                 @request.session[:query] = {:id => q.id, :project_id => 1}
                 with_settings :display_subprojects_issues => '0' do
               end
               def test_private_query_should_not_be_available_to_other_users
-                q = Query.create!(:name => "private", :user => User.find(2), :is_public => false, :project => nil)
+                q = IssueQuery.create!(:name => "private", :user => User.find(2), :is_public => false, :project => nil)
                 @request.session[:user_id] = 3
                 get :index, :query_id => q.id
               end
               def test_private_query_should_be_available_to_its_user
-                q = Query.create!(:name => "private", :user => User.find(2), :is_public => false, :project => nil)
+                q = IssueQuery.create!(:name => "private", :user => User.find(2), :is_public => false, :project => nil)
                 @request.session[:user_id] = 2
                 get :index, :query_id => q.id
               end
               def test_public_query_should_be_available_to_other_users
-                q = Query.create!(:name => "private", :user => User.find(2), :is_public => true, :project => nil)
+                q = IssueQuery.create!(:name => "private", :user => User.find(2), :is_public => true, :project => nil)
                 @request.session[:user_id] = 3
                 get :index, :query_id => q.id
                 # query should use specified columns
                 query = assigns(:query)
-                assert_kind_of Query, query
+                assert_kind_of IssueQuery, query
                 assert_equal columns, query.column_names.map(&:to_s)
                 # columns should be stored in session
                 # query should use specified columns
                 query = assigns(:query)
-                assert_kind_of Query, query
+                assert_kind_of IssueQuery, query
                 assert_equal [:project, :tracker, :subject, :assigned_to], query.columns.map(&:name)
               end
                 # query should use specified columns
                 query = assigns(:query)
-                assert_kind_of Query, query
+                assert_kind_of IssueQuery, query
                 assert_equal columns.map(&:to_sym), query.columns.map(&:name)
               end
                 # query should use specified columns
                 query = assigns(:query)
-                assert_kind_of Query, query
+                assert_kind_of IssueQuery, query
                 assert_equal columns, query.column_names.map(&:to_s)
                 assert_select 'table.issues td.cf_2.string'
               end
               def test_show_should_display_prev_next_links_with_saved_query_in_session
-                query = Query.create!(:name => 'test', :is_public => true,  :user_id => 1,
+                query = IssueQuery.create!(:name => 'test', :is_public => true,  :user_id => 1,
                   :filters => {'status_id' => {:values => ['5'], :operator => '='}},
                   :sort_criteria => [['id', 'asc']])
                 @request.session[:query] = {:id => query.id, :project_id => nil}
                 CustomValue.create!(:custom_field => cf, :customized => Issue.find(3), :value => '3')
                 CustomValue.create!(:custom_field => cf, :customized => Issue.find(5), :value => '')
-                query = Query.create!(:name => 'test', :is_public => true,  :user_id => 1, :filters => {},
+                query = IssueQuery.create!(:name => 'test', :is_public => true,  :user_id => 1, :filters => {},
                   :sort_criteria => [["cf_#{cf.id}", 'asc'], ['id', 'asc']])
                 @request.session[:query] = {:id => query.id, :project_id => nil}

test/functional/issues_controller_transaction_test.rb +1 -1

               end
               def test_index_should_rescue_invalid_sql_query
-                Query.any_instance.stubs(:statement).returns("INVALID STATEMENT")
+                IssueQuery.any_instance.stubs(:statement).returns("INVALID STATEMENT")
                 get :index
                 assert_response 500

test/unit/helpers/queries_helper_test.rb +2 -2

               def test_order
                 User.current = User.find_by_login('admin')
-                query = Query.new(:project => nil, :name => '_')
+                query = IssueQuery.new(:project => nil, :name => '_')
                 assert_equal 30, query.available_filters.size
                 fo = filters_options(query)
                 assert_equal 31, fo.size
                         )
                 assert field.save
                 User.current = User.find_by_login('admin')
-                query = Query.new(:project => nil, :name => '_')
+                query = IssueQuery.new(:project => nil, :name => '_')
                 assert_equal 32, query.available_filters.size
                 fo = filters_options(query)
                 assert_equal 33, fo.size

test/unit/lib/redmine/helpers/gantt_test.rb +1 -1

                 @project = project
                 @gantt = Redmine::Helpers::Gantt.new(options)
                 @gantt.project = @project
-                @gantt.query = Query.create!(:project => @project, :name => 'Gantt')
+                @gantt.query = IssueQuery.create!(:project => @project, :name => 'Gantt')
                 @gantt.view = self
                 @gantt.instance_variable_set('@date_from', options[:date_from] || (today - 14))
                 @gantt.instance_variable_set('@date_to', options[:date_to] || (today + 14))

test/unit/query_test.rb +121 -122

                        :custom_fields_trackers
               def test_custom_fields_for_all_projects_should_be_available_in_global_queries
-                query = Query.new(:project => nil, :name => '_')
+                query = IssueQuery.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 => '_')
+                query = IssueQuery.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 => '_')
+                query = IssueQuery.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]}
               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 = IssueQuery.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)
+                query = IssueQuery.find(1)
                 assert query.valid?
                 assert query.statement.include?("#{CustomValue.table_name}.value IN ('MySQL')")
                 issues = find_issues_with_query(query)
               end
               def test_operator_none
-                query = Query.new(:project => Project.find(1), :name => '_')
+                query = IssueQuery.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")
               end
               def test_operator_none_for_integer
-                query = Query.new(:project => Project.find(1), :name => '_')
+                query = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter('estimated_hours', '!*', [''])
                 issues = find_issues_with_query(query)
                 assert !issues.empty?
               end
               def test_operator_none_for_date
-                query = Query.new(:project => Project.find(1), :name => '_')
+                query = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter('start_date', '!*', [''])
                 issues = find_issues_with_query(query)
                 assert !issues.empty?
               end
               def test_operator_none_for_string_custom_field
-                query = Query.new(:project => Project.find(1), :name => '_')
+                query = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter('cf_2', '!*', [''])
                 assert query.has_filter?('cf_2')
                 issues = find_issues_with_query(query)
               end
               def test_operator_all
-                query = Query.new(:project => Project.find(1), :name => '_')
+                query = IssueQuery.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")
               end
               def test_operator_all_for_date
-                query = Query.new(:project => Project.find(1), :name => '_')
+                query = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter('start_date', '*', [''])
                 issues = find_issues_with_query(query)
                 assert !issues.empty?
               end
               def test_operator_all_for_string_custom_field
-                query = Query.new(:project => Project.find(1), :name => '_')
+                query = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter('cf_2', '*', [''])
                 assert query.has_filter?('cf_2')
                 issues = find_issues_with_query(query)
               end
               def test_numeric_filter_should_not_accept_non_numeric_values
-                query = Query.new(:name => '_')
+                query = IssueQuery.new(:name => '_')
                 query.add_filter('estimated_hours', '=', ['a'])
                 assert query.has_filter?('estimated_hours')
               def test_operator_is_on_float
                 Issue.update_all("estimated_hours = 171.2", "id=2")
-                query = Query.new(:name => '_')
+                query = IssueQuery.new(:name => '_')
                 query.add_filter('estimated_hours', '=', ['171.20'])
                 issues = find_issues_with_query(query)
                 assert_equal 1, issues.size
                 CustomValue.create!(:custom_field => f, :customized => Issue.find(2), :value => '12')
                 CustomValue.create!(:custom_field => f, :customized => Issue.find(3), :value => '')
-                query = Query.new(:name => '_')
+                query = IssueQuery.new(:name => '_')
                 query.add_filter("cf_#{f.id}", '=', ['12'])
                 issues = find_issues_with_query(query)
                 assert_equal 1, issues.size
                 CustomValue.create!(:custom_field => f, :customized => Issue.find(2), :value => '-12')
                 CustomValue.create!(:custom_field => f, :customized => Issue.find(3), :value => '')
-                query = Query.new(:name => '_')
+                query = IssueQuery.new(:name => '_')
                 query.add_filter("cf_#{f.id}", '=', ['-12'])
                 assert query.valid?
                 issues = find_issues_with_query(query)
                 CustomValue.create!(:custom_field => f, :customized => Issue.find(2), :value => '12.7')
                 CustomValue.create!(:custom_field => f, :customized => Issue.find(3), :value => '')
-                query = Query.new(:name => '_')
+                query = IssueQuery.new(:name => '_')
                 query.add_filter("cf_#{f.id}", '=', ['12.7'])
                 issues = find_issues_with_query(query)
                 assert_equal 1, issues.size
                 CustomValue.create!(:custom_field => f, :customized => Issue.find(2), :value => '-12.7')
                 CustomValue.create!(:custom_field => f, :customized => Issue.find(3), :value => '')
-                query = Query.new(:name => '_')
+                query = IssueQuery.new(:name => '_')
                 query.add_filter("cf_#{f.id}", '=', ['-12.7'])
                 assert query.valid?
                 issues = find_issues_with_query(query)
                 CustomValue.create!(:custom_field => f, :customized => Issue.find(1), :value => 'value2')
                 CustomValue.create!(:custom_field => f, :customized => Issue.find(3), :value => 'value1')
-                query = Query.new(:name => '_')
+                query = IssueQuery.new(:name => '_')
                 query.add_filter("cf_#{f.id}", '=', ['value1'])
                 issues = find_issues_with_query(query)
                 assert_equal [1, 3], issues.map(&:id).sort
-                query = Query.new(:name => '_')
+                query = IssueQuery.new(:name => '_')
                 query.add_filter("cf_#{f.id}", '=', ['value2'])
                 issues = find_issues_with_query(query)
                 assert_equal [1], issues.map(&:id).sort
                 CustomValue.create!(:custom_field => f, :customized => Issue.find(1), :value => 'value2')
                 CustomValue.create!(:custom_field => f, :customized => Issue.find(3), :value => 'value1')
-                query = Query.new(:name => '_')
+                query = IssueQuery.new(:name => '_')
                 query.add_filter("cf_#{f.id}", '!', ['value1'])
                 issues = find_issues_with_query(query)
                 assert !issues.map(&:id).include?(1)
                 assert !issues.map(&:id).include?(3)
-                query = Query.new(:name => '_')
+                query = IssueQuery.new(:name => '_')
                 query.add_filter("cf_#{f.id}", '!', ['value2'])
                 issues = find_issues_with_query(query)
                 assert !issues.map(&:id).include?(1)
                 # is_private filter only available for those who can set issues private
                 User.current = User.find(2)
-                query = Query.new(:name => '_')
+                query = IssueQuery.new(:name => '_')
                 assert query.available_filters.key?('is_private')
                 query.add_filter("is_private", '=', ['1'])
                 # is_private filter only available for those who can set issues private
                 User.current = User.find(2)
-                query = Query.new(:name => '_')
+                query = IssueQuery.new(:name => '_')
                 assert query.available_filters.key?('is_private')
                 query.add_filter("is_private", '!', ['1'])
               end
               def test_operator_greater_than
-                query = Query.new(:project => Project.find(1), :name => '_')
+                query = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter('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 = IssueQuery.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)
                 CustomValue.create!(:custom_field => f, :customized => Issue.find(2), :value => '12')
                 CustomValue.create!(:custom_field => f, :customized => Issue.find(3), :value => '')
-                query = Query.new(:project => Project.find(1), :name => '_')
+                query = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter("cf_#{f.id}", '>=', ['8'])
                 issues = find_issues_with_query(query)
                 assert_equal 1, issues.size
               end
               def test_operator_lesser_than
-                query = Query.new(:project => Project.find(1), :name => '_')
+                query = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter('done_ratio', '<=', ['30'])
                 assert query.statement.include?("#{Issue.table_name}.done_ratio <= 30.0")
                 find_issues_with_query(query)
               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 = IssueQuery.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.0")
                 find_issues_with_query(query)
               end
               def test_operator_between
-                query = Query.new(:project => Project.find(1), :name => '_')
+                query = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter('done_ratio', '><', ['30', '40'])
                 assert_include "#{Issue.table_name}.done_ratio BETWEEN 30.0 AND 40.0", query.statement
                 find_issues_with_query(query)
               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 = IssueQuery.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.0 AND 40.0", query.statement
                 find_issues_with_query(query)
               end
               def test_date_filter_should_not_accept_non_date_values
-                query = Query.new(:name => '_')
+                query = IssueQuery.new(:name => '_')
                 query.add_filter('created_on', '=', ['a'])
                 assert query.has_filter?('created_on')
               end
               def test_date_filter_should_not_accept_invalid_date_values
-                query = Query.new(:name => '_')
+                query = IssueQuery.new(:name => '_')
                 query.add_filter('created_on', '=', ['2011-01-34'])
                 assert query.has_filter?('created_on')
               end
               def test_relative_date_filter_should_not_accept_non_integer_values
-                query = Query.new(:name => '_')
+                query = IssueQuery.new(:name => '_')
                 query.add_filter('created_on', '>t-', ['a'])
                 assert query.has_filter?('created_on')
               end
               def test_operator_date_equals
-                query = Query.new(:name => '_')
+                query = IssueQuery.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 = IssueQuery.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 = IssueQuery.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 = IssueQuery.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)
               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 = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter('due_date', '>t+', ['15'])
                 issues = find_issues_with_query(query)
                 assert !issues.empty?
               end
               def test_operator_in_less_than
-                query = Query.new(:project => Project.find(1), :name => '_')
+                query = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter('due_date', '<t+', ['15'])
                 issues = find_issues_with_query(query)
                 assert !issues.empty?
               end
               def test_operator_in_the_next_days
-                query = Query.new(:project => Project.find(1), :name => '_')
+                query = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter('due_date', '><t+', ['15'])
                 issues = find_issues_with_query(query)
                 assert !issues.empty?
               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 = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter('due_date', '>t-', ['3'])
                 issues = find_issues_with_query(query)
                 assert !issues.empty?
               def test_operator_in_the_past_days
                 Issue.find(7).update_attribute(:due_date, (Date.today - 3))
-                query = Query.new(:project => Project.find(1), :name => '_')
+                query = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter('due_date', '><t-', ['3'])
                 issues = find_issues_with_query(query)
                 assert !issues.empty?
               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 = IssueQuery.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)
               def test_operator_in
                 Issue.find(7).update_attribute(:due_date, (Date.today + 2))
-                query = Query.new(:project => Project.find(1), :name => '_')
+                query = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter('due_date', 't+', ['2'])
                 issues = find_issues_with_query(query)
                 assert !issues.empty?
               def test_operator_ago
                 Issue.find(7).update_attribute(:due_date, (Date.today - 3))
-                query = Query.new(:project => Project.find(1), :name => '_')
+                query = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter('due_date', 't-', ['3'])
                 issues = find_issues_with_query(query)
                 assert !issues.empty?
               end
               def test_operator_today
-                query = Query.new(:project => Project.find(1), :name => '_')
+                query = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter('due_date', 't', [''])
                 issues = find_issues_with_query(query)
                 assert !issues.empty?
               end
               def test_operator_this_week_on_date
-                query = Query.new(:project => Project.find(1), :name => '_')
+                query = IssueQuery.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 = IssueQuery.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 = IssueQuery.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)
                 Date.stubs(:today).returns(Date.parse('2011-04-29'))
-                query = Query.new(:project => Project.find(1), :name => '_')
+                query = IssueQuery.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
                 Date.stubs(:today).returns(Date.parse('2011-04-29'))
-                query = Query.new(:project => Project.find(1), :name => '_')
+                query = IssueQuery.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 = IssueQuery.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)
                 i3 = Issue.generate!(:project_id => 1, :tracker_id => 1, :assigned_to => Group.find(11))
                 group.users << user
-                query = Query.new(:name => '_', :filters => { 'assigned_to_id' => {:operator => '=', :values => ['me']}})
+                query = IssueQuery.new(:name => '_', :filters => { 'assigned_to_id' => {:operator => '=', :values => ['me']}})
                 result = query.issues
                 assert_equal Issue.visible.all(:conditions => {:assigned_to_id => ([2] + user.reload.group_ids)}).sort_by(&:id), result.sort_by(&:id)
                 issue1 = Issue.create!(:project_id => 1, :tracker_id => 1, :custom_field_values => {cf.id.to_s => '2'}, :subject => 'Test', :author_id => 1)
                 issue2 = Issue.generate!(:project_id => 1, :tracker_id => 1, :custom_field_values => {cf.id.to_s => '3'})
-                query = Query.new(:name => '_', :project => Project.find(1))
+                query = IssueQuery.new(:name => '_', :project => Project.find(1))
                 filter = query.available_filters["cf_#{cf.id}"]
                 assert_not_nil filter
                 assert_include 'me', filter[:values].map{|v| v[1]}
               def test_filter_my_projects
                 User.current = User.find(2)
-                query = Query.new(:name => '_')
+                query = IssueQuery.new(:name => '_')
                 filter = query.available_filters['project_id']
                 assert_not_nil filter
                 assert_include 'mine', filter[:values].map{|v| v[1]}
               def test_filter_watched_issues
                 User.current = User.find(1)
-                query = Query.new(:name => '_', :filters => { 'watcher_id' => {:operator => '=', :values => ['me']}})
+                query = IssueQuery.new(:name => '_', :filters => { 'watcher_id' => {:operator => '=', :values => ['me']}})
                 result = find_issues_with_query(query)
                 assert_not_nil result
                 assert !result.empty?
               def test_filter_unwatched_issues
                 User.current = User.find(1)
-                query = Query.new(:name => '_', :filters => { 'watcher_id' => {:operator => '!', :values => ['me']}})
+                query = IssueQuery.new(:name => '_', :filters => { 'watcher_id' => {:operator => '!', :values => ['me']}})
                 result = find_issues_with_query(query)
                 assert_not_nil result
                 assert !result.empty?
                 CustomValue.create!(:custom_field => field, :customized => Project.find(3), :value => 'Foo')
                 CustomValue.create!(:custom_field => field, :customized => Project.find(5), :value => 'Foo')
-                query = Query.new(:name => '_')
+                query = IssueQuery.new(:name => '_')
                 filter_name = "project.cf_#{field.id}"
                 assert_include filter_name, query.available_filters.keys
                 query.filters = {filter_name => {:operator => '=', :values => ['Foo']}}
                 field = UserCustomField.create!(:name => 'Client', :is_filter => true, :field_format => 'string')
                 CustomValue.create!(:custom_field => field, :customized => User.find(3), :value => 'Foo')
-                query = Query.new(:name => '_')
+                query = IssueQuery.new(:name => '_')
                 filter_name = "author.cf_#{field.id}"
                 assert_include filter_name, query.available_filters.keys
                 query.filters = {filter_name => {:operator => '=', :values => ['Foo']}}
                 field = UserCustomField.create!(:name => 'Client', :is_filter => true, :field_format => 'string')
                 CustomValue.create!(:custom_field => field, :customized => User.find(3), :value => 'Foo')
-                query = Query.new(:name => '_')
+                query = IssueQuery.new(:name => '_')
                 filter_name = "assigned_to.cf_#{field.id}"
                 assert_include filter_name, query.available_filters.keys
                 query.filters = {filter_name => {:operator => '=', :values => ['Foo']}}
                 field = VersionCustomField.create!(:name => 'Client', :is_filter => true, :field_format => 'string')
                 CustomValue.create!(:custom_field => field, :customized => Version.find(2), :value => 'Foo')
-                query = Query.new(:name => '_')
+                query = IssueQuery.new(:name => '_')
                 filter_name = "fixed_version.cf_#{field.id}"
                 assert_include filter_name, query.available_filters.keys
                 query.filters = {filter_name => {:operator => '=', :values => ['Foo']}}
                 IssueRelation.create!(:relation_type => "relates", :issue_from => Issue.find(1), :issue_to => Issue.find(2))
                 IssueRelation.create!(:relation_type => "relates", :issue_from => Issue.find(3), :issue_to => Issue.find(1))
-                query = Query.new(:name => '_')
+                query = IssueQuery.new(:name => '_')
                 query.filters = {"relates" => {:operator => '=', :values => ['1']}}
                 assert_equal [2, 3], find_issues_with_query(query).map(&:id).sort
-                query = Query.new(:name => '_')
+                query = IssueQuery.new(:name => '_')
                 query.filters = {"relates" => {:operator => '=', :values => ['2']}}
                 assert_equal [1], find_issues_with_query(query).map(&:id).sort
               end
                   IssueRelation.create!(:relation_type => "relates", :issue_from => Issue.find(1), :issue_to => Project.find(3).issues.first)
                 end
-                query = Query.new(:name => '_')
+                query = IssueQuery.new(:name => '_')
                 query.filters = {"relates" => {:operator => '=p', :values => ['2']}}
                 assert_equal [1, 2], find_issues_with_query(query).map(&:id).sort
-                query = Query.new(:name => '_')
+                query = IssueQuery.new(:name => '_')
                 query.filters = {"relates" => {:operator => '=p', :values => ['3']}}
                 assert_equal [1], find_issues_with_query(query).map(&:id).sort
-                query = Query.new(:name => '_')
+                query = IssueQuery.new(:name => '_')
                 query.filters = {"relates" => {:operator => '=p', :values => ['4']}}
                 assert_equal [], find_issues_with_query(query).map(&:id).sort
               end
                   IssueRelation.create!(:relation_type => "relates", :issue_from => Issue.find(1), :issue_to => Project.find(3).issues.first)
                 end
-                query = Query.new(:name => '_')
+                query = IssueQuery.new(:name => '_')
                 query.filters = {"relates" => {:operator => '=!p', :values => ['1']}}
                 assert_equal [1], find_issues_with_query(query).map(&:id).sort
               end
                   IssueRelation.create!(:relation_type => "relates", :issue_to => Project.find(2).issues.first, :issue_from => Issue.find(3))
                 end
-                query = Query.new(:name => '_')
+                query = IssueQuery.new(:name => '_')
                 query.filters = {"relates" => {:operator => '!p', :values => ['2']}}
                 ids = find_issues_with_query(query).map(&:id).sort
                 assert_include 2, ids
                 IssueRelation.create!(:relation_type => "relates", :issue_from => Issue.find(1), :issue_to => Issue.find(2))
                 IssueRelation.create!(:relation_type => "relates", :issue_from => Issue.find(3), :issue_to => Issue.find(1))
-                query = Query.new(:name => '_')
+                query = IssueQuery.new(:name => '_')
                 query.filters = {"relates" => {:operator => '!*', :values => ['']}}
                 ids = find_issues_with_query(query).map(&:id)
                 assert_equal [], ids & [1, 2, 3]
                 IssueRelation.create!(:relation_type => "relates", :issue_from => Issue.find(1), :issue_to => Issue.find(2))
                 IssueRelation.create!(:relation_type => "relates", :issue_from => Issue.find(3), :issue_to => Issue.find(1))
-                query = Query.new(:name => '_')
+                query = IssueQuery.new(:name => '_')
                 query.filters = {"relates" => {:operator => '*', :values => ['']}}
                 assert_equal [1, 2, 3], find_issues_with_query(query).map(&:id).sort
               end
               def test_statement_should_be_nil_with_no_filters
-                q = Query.new(:name => '_')
+                q = IssueQuery.new(:name => '_')
                 q.filters = {}
                 assert q.valid?
               end
               def test_default_columns
-                q = Query.new
+                q = IssueQuery.new
                 assert q.columns.any?
                 assert q.inline_columns.any?
                 assert q.block_columns.empty?
               end
               def test_set_column_names
-                q = Query.new
+                q = IssueQuery.new
                 q.column_names = ['tracker', :subject, '', 'unknonw_column']
                 assert_equal [:tracker, :subject], q.columns.collect {|c| c.name}
                 c = q.columns.first
               end
               def test_inline_and_block_columns
-                q = Query.new
+                q = IssueQuery.new
                 q.column_names = ['subject', 'description', 'tracker']
                 assert_equal [:subject, :tracker], q.inline_columns.map(&:name)
               end
               def test_custom_field_columns_should_be_inline
-                q = Query.new
+                q = IssueQuery.new
                 columns = q.available_columns.select {|column| column.is_a? QueryCustomFieldColumn}
                 assert columns.any?
                 assert_nil columns.detect {|column| !column.inline?}
               end
               def test_query_should_preload_spent_hours
-                q = Query.new(:name => '_', :column_names => [:subject, :spent_hours])
+                q = IssueQuery.new(:name => '_', :column_names => [:subject, :spent_hours])
                 assert q.has_column?(:spent_hours)
                 issues = q.issues
                 assert_not_nil issues.first.instance_variable_get("@spent_hours")
               end
               def test_groupable_columns_should_include_custom_fields
-                q = Query.new
+                q = IssueQuery.new
                 column = q.groupable_columns.detect {|c| c.name == :cf_1}
                 assert_not_nil column
                 assert_kind_of QueryCustomFieldColumn, column
                 field = CustomField.find(1)
                 field.update_attribute :multiple, true
-                q = Query.new
+                q = IssueQuery.new
                 column = q.groupable_columns.detect {|c| c.name == :cf_1}
                 assert_nil column
               end
               def test_groupable_columns_should_include_user_custom_fields
                 cf = IssueCustomField.create!(:name => 'User', :is_for_all => true, :tracker_ids => [1], :field_format => 'user')
-                q = Query.new
+                q = IssueQuery.new
                 assert q.groupable_columns.detect {|c| c.name == "cf_#{cf.id}".to_sym}
               end
               def test_groupable_columns_should_include_version_custom_fields
                 cf = IssueCustomField.create!(:name => 'User', :is_for_all => true, :tracker_ids => [1], :field_format => 'version')
-                q = Query.new
+                q = IssueQuery.new
                 assert q.groupable_columns.detect {|c| c.name == "cf_#{cf.id}".to_sym}
               end
               def test_grouped_with_valid_column
-                q = Query.new(:group_by => 'status')
+                q = IssueQuery.new(:group_by => 'status')
                 assert q.grouped?
                 assert_not_nil q.group_by_column
                 assert_equal :status, q.group_by_column.name
               end
               def test_grouped_with_invalid_column
-                q = Query.new(:group_by => 'foo')
+                q = IssueQuery.new(:group_by => 'foo')
                 assert !q.grouped?
                 assert_nil q.group_by_column
                 assert_nil q.group_by_statement
               def test_sortable_columns_should_sort_assignees_according_to_user_format_setting
                 with_settings :user_format => 'lastname_coma_firstname' do
-                  q = Query.new
+                  q = IssueQuery.new
                   assert q.sortable_columns.has_key?('assigned_to')
                   assert_equal %w(users.lastname users.firstname users.id), q.sortable_columns['assigned_to']
                 end
               def test_sortable_columns_should_sort_authors_according_to_user_format_setting
                 with_settings :user_format => 'lastname_coma_firstname' do
-                  q = Query.new
+                  q = IssueQuery.new
                   assert q.sortable_columns.has_key?('author')
                   assert_equal %w(authors.lastname authors.firstname authors.id), q.sortable_columns['author']
                 end
               end
               def test_sortable_columns_should_include_custom_field
-                q = Query.new
+                q = IssueQuery.new
                 assert q.sortable_columns['cf_1']
               end
                 field = CustomField.find(1)
                 field.update_attribute :multiple, true
-                q = Query.new
+                q = IssueQuery.new
                 assert !q.sortable_columns['cf_1']
               end
               def test_default_sort
-                q = Query.new
+                q = IssueQuery.new
                 assert_equal [], q.sort_criteria
               end
               def test_set_sort_criteria_with_hash
-                q = Query.new
+                q = IssueQuery.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 = IssueQuery.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 = IssueQuery.new(:name => 'Sorted')
                 q.sort_criteria = [['priority', 'desc'], 'tracker']
                 assert q.save
                 q.reload
               end
               def test_sort_by_string_custom_field_asc
-                q = Query.new
+                q = IssueQuery.new
                 c = q.available_columns.find {|col| col.is_a?(QueryCustomFieldColumn) && col.custom_field.field_format == 'string' }
                 assert c
                 assert c.sortable
               end
               def test_sort_by_string_custom_field_desc
-                q = Query.new
+                q = IssueQuery.new
                 c = q.available_columns.find {|col| col.is_a?(QueryCustomFieldColumn) && col.custom_field.field_format == 'string' }
                 assert c
                 assert c.sortable
               end
               def test_sort_by_float_custom_field_asc
-                q = Query.new
+                q = IssueQuery.new
                 c = q.available_columns.find {|col| col.is_a?(QueryCustomFieldColumn) && col.custom_field.field_format == 'float' }
                 assert c
                 assert c.sortable
               end
               def test_invalid_query_should_raise_query_statement_invalid_error
-                q = Query.new
+                q = IssueQuery.new
                 assert_raise Query::StatementInvalid do
                   q.issues(:conditions => "foo = 1")
                 end
               end
               def test_issue_count
-                q = Query.new(:name => '_')
+                q = IssueQuery.new(:name => '_')
                 issue_count = q.issue_count
                 assert_equal q.issues.size, issue_count
               end
               end
               def test_issue_count_by_association_group
-                q = Query.new(:name => '_', :group_by => 'assigned_to')
+                q = IssueQuery.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
               end
               def test_issue_count_by_list_custom_field_group
-                q = Query.new(:name => '_', :group_by => 'cf_1')
+                q = IssueQuery.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
               end
               def test_issue_count_by_date_custom_field_group
-                q = Query.new(:name => '_', :group_by => 'cf_8')
+                q = IssueQuery.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
               def test_issue_count_with_nil_group_only
                 Issue.update_all("assigned_to_id = NULL")
-                q = Query.new(:name => '_', :group_by => 'assigned_to')
+                q = IssueQuery.new(:name => '_', :group_by => 'assigned_to')
                 count_by_group = q.issue_count_by_group
                 assert_kind_of Hash, count_by_group
                 assert_equal 1, count_by_group.keys.size
               end
               def test_issue_ids
-                q = Query.new(:name => '_')
+                q = IssueQuery.new(:name => '_')
                 order = "issues.subject, issues.id"
                 issues = q.issues(:order => order)
                 assert_equal issues.map(&:id), q.issue_ids(:order => order)
               def test_label_for
                 set_language_if_valid 'en'
-                q = Query.new
+                q = IssueQuery.new
                 assert_equal 'Assignee', q.label_for('assigned_to_id')
               end
               def test_label_for_fr
                 set_language_if_valid 'fr'
-                q = Query.new
+                q = IssueQuery.new
                 s = "Assign\xc3\xa9 \xc3\xa0"
                 s.force_encoding('UTF-8') if s.respond_to?(:force_encoding)
                 assert_equal s, q.label_for('assigned_to_id')
                 developer = User.find(3)
                 # Public query on project 1
-                q = Query.find(1)
+                q = IssueQuery.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)
+                q = IssueQuery.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)
+                q = IssueQuery.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)
+                q = IssueQuery.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)
+                query_ids = IssueQuery.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'
               context "#available_filters" do
                 setup do
-                  @query = Query.new(:name => "_")
+                  @query = IssueQuery.new(:name => "_")
                 end
                 should "include users of visible projects in cross-project view" do
                   end
                   should "search assigned to for users in the group" do
-                    @query = Query.new(:name => '_')
+                    @query = IssueQuery.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}')"
                   end
                   should "search not assigned to any group member (none)" do
-                    @query = Query.new(:name => '_')
+                    @query = IssueQuery.new(:name => '_')
                     @query.add_filter('member_of_group', '!*', [''])
                     # Users not in a group
                   end
                   should "search assigned to any group member (all)" do
-                    @query = Query.new(:name => '_')
+                    @query = IssueQuery.new(:name => '_')
                     @query.add_filter('member_of_group', '*', [''])
                     # Only users in a group
                   should "return an empty set with = empty group" do
                     @empty_group = Group.generate!
-                    @query = Query.new(:name => '_')
+                    @query = IssueQuery.new(:name => '_')
                     @query.add_filter('member_of_group', '=', [@empty_group.id.to_s])
                     assert_equal [], find_issues_with_query(@query)
                   should "return issues with ! empty group" do
                     @empty_group = Group.generate!
-                    @query = Query.new(:name => '_')
+                    @query = IssueQuery.new(:name => '_')
                     @query.add_filter('member_of_group', '!', [@empty_group.id.to_s])
                     assert_find_issues_with_query_is_successful @query
                   end
                   should "search assigned to for users with the Role" do
-                    @query = Query.new(:name => '_', :project => @project)
+                    @query = IssueQuery.new(:name => '_', :project => @project)
                     @query.add_filter('assigned_to_role', '=', [@manager_role.id.to_s])
                     assert_query_result [@issue1, @issue3], @query
                     other_project = Project.generate!
                     User.add_to_project(@developer, other_project, @manager_role)
-                    @query = Query.new(:name => '_', :project => @project)
+                    @query = IssueQuery.new(:name => '_', :project => @project)
                     @query.add_filter('assigned_to_role', '=', [@manager_role.id.to_s])
                     assert_query_result [@issue1, @issue3], @query
                   should "return an empty set with empty role" do
                     @empty_role = Role.generate!
-                    @query = Query.new(:name => '_', :project => @project)
+                    @query = IssueQuery.new(:name => '_', :project => @project)
                     @query.add_filter('assigned_to_role', '=', [@empty_role.id.to_s])
                     assert_query_result [], @query
                   end
                   should "search assigned to for users without the Role" do
-                    @query = Query.new(:name => '_', :project => @project)
+                    @query = IssueQuery.new(:name => '_', :project => @project)
                     @query.add_filter('assigned_to_role', '!', [@manager_role.id.to_s])
                     assert_query_result [@issue2, @issue4, @issue5], @query
                   end
                   should "search assigned to for users not assigned to any Role (none)" do
-                    @query = Query.new(:name => '_', :project => @project)
+                    @query = IssueQuery.new(:name => '_', :project => @project)
                     @query.add_filter('assigned_to_role', '!*', [''])
                     assert_query_result [@issue4, @issue5], @query
                   end
                   should "search assigned to for users assigned to any Role (all)" do
-                    @query = Query.new(:name => '_', :project => @project)
+                    @query = IssueQuery.new(:name => '_', :project => @project)
                     @query.add_filter('assigned_to_role', '*', [''])
                     assert_query_result [@issue1, @issue2, @issue3], @query
                   should "return issues with ! empty role" do
                     @empty_role = Role.generate!
-                    @query = Query.new(:name => '_', :project => @project)
+                    @query = IssueQuery.new(:name => '_', :project => @project)
                     @query.add_filter('assigned_to_role', '!', [@empty_role.id.to_s])
                     assert_query_result [@issue1, @issue2, @issue3, @issue4, @issue5], @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