##// END OF EJS Templates
jro_apps » redmine
RSS
Fixed date query filters (wrong results and sql error with postgresql)...
Jean-Philippe Lang -
r551:e7ff47cff565
parent child
Show More
Show file before | Show file after | Hide comments
@@ -1,234 +1,234
1 1 # redMine - project management software
2 2 # Copyright (C) 2006-2007 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 class Query < ActiveRecord::Base
19 19 belongs_to :project
20 20 belongs_to :user
21 21 serialize :filters
22 22
23 23 attr_protected :project, :user
24 24 attr_accessor :executed_by
25 25
26 26 validates_presence_of :name, :on => :save
27 27
28 28 @@operators = { "=" => :label_equals,
29 29 "!" => :label_not_equals,
30 30 "o" => :label_open_issues,
31 31 "c" => :label_closed_issues,
32 32 "!*" => :label_none,
33 33 "*" => :label_all,
34 34 "<t+" => :label_in_less_than,
35 35 ">t+" => :label_in_more_than,
36 36 "t+" => :label_in,
37 37 "t" => :label_today,
38 38 ">t-" => :label_less_than_ago,
39 39 "<t-" => :label_more_than_ago,
40 40 "t-" => :label_ago,
41 41 "~" => :label_contains,
42 42 "!~" => :label_not_contains }
43 43
44 44 cattr_reader :operators
45 45
46 46 @@operators_by_filter_type = { :list => [ "=", "!" ],
47 47 :list_status => [ "o", "=", "!", "c", "*" ],
48 48 :list_optional => [ "=", "!", "!*", "*" ],
49 49 :list_one_or_more => [ "*", "=" ],
50 50 :date => [ "<t+", ">t+", "t+", "t", ">t-", "<t-", "t-" ],
51 51 :date_past => [ ">t-", "<t-", "t-", "t" ],
52 52 :string => [ "=", "~", "!", "!~" ],
53 53 :text => [ "~", "!~" ] }
54 54
55 55 cattr_reader :operators_by_filter_type
56 56
57 57 def initialize(attributes = nil)
58 58 super attributes
59 59 self.filters ||= { 'status_id' => {:operator => "o", :values => [""]} }
60 60 self.is_public = true
61 61 end
62 62
63 63 def executed_by=(user)
64 64 @executed_by = user
65 65 set_language_if_valid(user.language) if user
66 66 end
67 67
68 68 def validate
69 69 filters.each_key do |field|
70 70 errors.add label_for(field), :activerecord_error_blank unless
71 71 # filter requires one or more values
72 72 (values_for(field) and !values_for(field).first.empty?) or
73 73 # filter doesn't require any value
74 74 ["o", "c", "!*", "*", "t"].include? operator_for(field)
75 75 end if filters
76 76 end
77 77
78 78 def available_filters
79 79 return @available_filters if @available_filters
80 80 @available_filters = { "status_id" => { :type => :list_status, :order => 1, :values => IssueStatus.find(:all, :order => 'position').collect{|s| [s.name, s.id.to_s] } },
81 81 "tracker_id" => { :type => :list, :order => 2, :values => Tracker.find(:all, :order => 'position').collect{|s| [s.name, s.id.to_s] } },
82 82 "priority_id" => { :type => :list, :order => 3, :values => Enumeration.find(:all, :conditions => ['opt=?','IPRI']).collect{|s| [s.name, s.id.to_s] } },
83 83 "subject" => { :type => :text, :order => 8 },
84 84 "created_on" => { :type => :date_past, :order => 9 },
85 85 "updated_on" => { :type => :date_past, :order => 10 },
86 86 "start_date" => { :type => :date, :order => 11 },
87 87 "due_date" => { :type => :date, :order => 12 } }
88 88 unless project.nil?
89 89 # project specific filters
90 90 user_values = []
91 91 user_values << ["<< #{l(:label_me)} >>", "me"] if executed_by
92 92 user_values += @project.users.collect{|s| [s.name, s.id.to_s] }
93 93
94 94 @available_filters["assigned_to_id"] = { :type => :list_optional, :order => 4, :values => user_values }
95 95 @available_filters["author_id"] = { :type => :list, :order => 5, :values => user_values }
96 96 @available_filters["category_id"] = { :type => :list_optional, :order => 6, :values => @project.issue_categories.collect{|s| [s.name, s.id.to_s] } }
97 97 @available_filters["fixed_version_id"] = { :type => :list_optional, :order => 7, :values => @project.versions.sort.collect{|s| [s.name, s.id.to_s] } }
98 98 unless @project.active_children.empty?
99 99 @available_filters["subproject_id"] = { :type => :list_one_or_more, :order => 13, :values => @project.active_children.collect{|s| [s.name, s.id.to_s] } }
100 100 end
101 101 @project.all_custom_fields.select(&:is_filter?).each do |field|
102 102 case field.field_format
103 103 when "string", "int"
104 104 options = { :type => :string, :order => 20 }
105 105 when "text"
106 106 options = { :type => :text, :order => 20 }
107 107 when "list"
108 108 options = { :type => :list_optional, :values => field.possible_values, :order => 20}
109 109 when "date"
110 110 options = { :type => :date, :order => 20 }
111 111 when "bool"
112 112 options = { :type => :list, :values => [[l(:general_text_yes), "1"], [l(:general_text_no), "0"]], :order => 20 }
113 113 end
114 114 @available_filters["cf_#{field.id}"] = options.merge({ :name => field.name })
115 115 end
116 116 # remove category filter if no category defined
117 117 @available_filters.delete "category_id" if @available_filters["category_id"][:values].empty?
118 118 end
119 119 @available_filters
120 120 end
121 121
122 122 def add_filter(field, operator, values)
123 123 # values must be an array
124 124 return unless values and values.is_a? Array # and !values.first.empty?
125 125 # check if field is defined as an available filter
126 126 if available_filters.has_key? field
127 127 filter_options = available_filters[field]
128 128 # check if operator is allowed for that filter
129 129 #if @@operators_by_filter_type[filter_options[:type]].include? operator
130 130 # allowed_values = values & ([""] + (filter_options[:values] || []).collect {|val| val[1]})
131 131 # filters[field] = {:operator => operator, :values => allowed_values } if (allowed_values.first and !allowed_values.first.empty?) or ["o", "c", "!*", "*", "t"].include? operator
132 132 #end
133 133 filters[field] = {:operator => operator, :values => values }
134 134 end
135 135 end
136 136
137 137 def add_short_filter(field, expression)
138 138 return unless expression
139 139 parms = expression.scan(/^(o|c|\!|\*)?(.*)$/).first
140 140 add_filter field, (parms[0] || "="), [parms[1] || ""]
141 141 end
142 142
143 143 def has_filter?(field)
144 144 filters and filters[field]
145 145 end
146 146
147 147 def operator_for(field)
148 148 has_filter?(field) ? filters[field][:operator] : nil
149 149 end
150 150
151 151 def values_for(field)
152 152 has_filter?(field) ? filters[field][:values] : nil
153 153 end
154 154
155 155 def label_for(field)
156 156 label = @available_filters[field][:name] if @available_filters.has_key?(field)
157 157 label ||= field.gsub(/\_id$/, "")
158 158 end
159 159
160 160 def statement
161 161 sql = "1=1"
162 162 if has_filter?("subproject_id")
163 163 subproject_ids = []
164 164 if operator_for("subproject_id") == "="
165 165 subproject_ids = values_for("subproject_id").each(&:to_i)
166 166 else
167 167 subproject_ids = project.active_children.collect{|p| p.id}
168 168 end
169 169 sql << " AND #{Issue.table_name}.project_id IN (%d,%s)" % [project.id, subproject_ids.join(",")] if project
170 170 else
171 171 sql << " AND #{Issue.table_name}.project_id=%d" % project.id if project
172 172 end
173 173 filters.each_key do |field|
174 174 next if field == "subproject_id"
175 175 v = values_for(field).clone
176 176 next unless v and !v.empty?
177 177
178 178 sql = sql + " AND " unless sql.empty?
179 179 sql << "("
180 180
181 181 if field =~ /^cf_(\d+)$/
182 182 # custom field
183 183 db_table = CustomValue.table_name
184 184 db_field = "value"
185 185 sql << "#{db_table}.custom_field_id = #{$1} AND "
186 186 else
187 187 # regular field
188 188 db_table = Issue.table_name
189 189 db_field = field
190 190 end
191 191
192 192 # "me" value subsitution
193 193 if %w(assigned_to_id author_id).include?(field)
194 194 v.push(executed_by ? executed_by.id.to_s : "0") if v.delete("me")
195 195 end
196 196
197 197 case operator_for field
198 198 when "="
199 199 sql = sql + "#{db_table}.#{db_field} IN (" + v.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + ")"
200 200 when "!"
201 201 sql = sql + "#{db_table}.#{db_field} NOT IN (" + v.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + ")"
202 202 when "!*"
203 203 sql = sql + "#{db_table}.#{db_field} IS NULL"
204 204 when "*"
205 205 sql = sql + "#{db_table}.#{db_field} IS NOT NULL"
206 206 when "o"
207 207 sql = sql + "#{IssueStatus.table_name}.is_closed=#{connection.quoted_false}" if field == "status_id"
208 208 when "c"
209 209 sql = sql + "#{IssueStatus.table_name}.is_closed=#{connection.quoted_true}" if field == "status_id"
210 210 when ">t-"
211 sql = sql + "#{db_table}.#{db_field} >= '%s'" % connection.quoted_date(Date.today - v.first.to_i)
211 sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date((Date.today - v.first.to_i).to_time), connection.quoted_date((Date.today + 1).to_time)]
212 212 when "<t-"
213 sql = sql + "#{db_table}.#{db_field} BETWEEN '#{connection.quoted_date(Date.new(0))}' AND '" + (Date.today - v.first.to_i).strftime("%Y-%m-%d") + "'"
213 sql = sql + "#{db_table}.#{db_field} <= '%s'" % connection.quoted_date((Date.today - v.first.to_i).to_time)
214 214 when "t-"
215 sql = sql + "#{db_table}.#{db_field} = '" + (Date.today - v.first.to_i).strftime("%Y-%m-%d") + "'"
215 sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date((Date.today - v.first.to_i).to_time), connection.quoted_date((Date.today - v.first.to_i + 1).to_time)]
216 216 when ">t+"
217 sql = sql + "#{db_table}.#{db_field} >= '" + (Date.today + v.first.to_i).strftime("%Y-%m-%d") + "'"
217 sql = sql + "#{db_table}.#{db_field} >= '%s'" % connection.quoted_date((Date.today + v.first.to_i).to_time)
218 218 when "<t+"
219 sql = sql + "#{db_table}.#{db_field} BETWEEN '#{connection.quoted_date(Date.new(0))}' AND '" + (Date.today + v.first.to_i).strftime("%Y-%m-%d") + "'"
219 sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date(Date.today.to_time), connection.quoted_date((Date.today + v.first.to_i + 1).to_time)]
220 220 when "t+"
221 sql = sql + "#{db_table}.#{db_field} = '" + (Date.today + v.first.to_i).strftime("%Y-%m-%d") + "'"
221 sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date((Date.today + v.first.to_i).to_time), connection.quoted_date((Date.today + v.first.to_i + 1).to_time)]
222 222 when "t"
223 sql = sql + "#{db_table}.#{db_field} = '%s'" % connection.quoted_date(Date.today)
223 sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date(Date.today.to_time), connection.quoted_date((Date.today+1).to_time)]
224 224 when "~"
225 225 sql = sql + "#{db_table}.#{db_field} LIKE '%#{connection.quote_string(v.first)}%'"
226 226 when "!~"
227 227 sql = sql + "#{db_table}.#{db_field} NOT LIKE '%#{connection.quote_string(v.first)}%'"
228 228 end
229 229 sql << ")"
230 230
231 231 end if filters and valid?
232 232 sql
233 233 end
234 234 end
General Comments 0
You need to be logged in to leave comments. Login now