kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bit more refactoring on Query#sql_for_field to remove multiple returns 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2091 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Eric Davis 2008-12-05 22:56:08 +00:00
parent ea77929d62
commit a464d26e73
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/models/query.rb
View File

@ -325,51 +325,51 @@ class Query < ActiveRecord::Base
sql = '' sql = ''
case operator_for field case operator_for field
when "=" when "="
return "#{db_table}.#{db_field} IN (" + v.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + ")" sql = "#{db_table}.#{db_field} IN (" + v.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + ")"
when "!" when "!"
return "(#{db_table}.#{db_field} IS NULL OR #{db_table}.#{db_field} NOT IN (" + v.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + "))" sql = "(#{db_table}.#{db_field} IS NULL OR #{db_table}.#{db_field} NOT IN (" + v.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + "))"
when "!*" when "!*"
sql = "#{db_table}.#{db_field} IS NULL" sql = "#{db_table}.#{db_field} IS NULL"
sql << " OR #{db_table}.#{db_field} = ''" if is_custom_filter sql << " OR #{db_table}.#{db_field} = ''" if is_custom_filter
return sql
when "*" when "*"
sql = "#{db_table}.#{db_field} IS NOT NULL" sql = "#{db_table}.#{db_field} IS NOT NULL"
sql << " AND #{db_table}.#{db_field} <> ''" if is_custom_filter sql << " AND #{db_table}.#{db_field} <> ''" if is_custom_filter
return sql
when ">=" when ">="
return "#{db_table}.#{db_field} >= #{v.first.to_i}" sql = "#{db_table}.#{db_field} >= #{v.first.to_i}"
when "<=" when "<="
return "#{db_table}.#{db_field} <= #{v.first.to_i}" sql = "#{db_table}.#{db_field} <= #{v.first.to_i}"
when "o" when "o"
return "#{IssueStatus.table_name}.is_closed=#{connection.quoted_false}" if field == "status_id" sql = "#{IssueStatus.table_name}.is_closed=#{connection.quoted_false}" if field == "status_id"
when "c" when "c"
return "#{IssueStatus.table_name}.is_closed=#{connection.quoted_true}" if field == "status_id" sql = "#{IssueStatus.table_name}.is_closed=#{connection.quoted_true}" if field == "status_id"
when ">t-" when ">t-"
return date_range_clause(db_table, db_field, - v.first.to_i, 0) sql = date_range_clause(db_table, db_field, - v.first.to_i, 0)
when "<t-" when "<t-"
return date_range_clause(db_table, db_field, nil, - v.first.to_i) sql = date_range_clause(db_table, db_field, nil, - v.first.to_i)
when "t-" when "t-"
return date_range_clause(db_table, db_field, - v.first.to_i, - v.first.to_i) sql = date_range_clause(db_table, db_field, - v.first.to_i, - v.first.to_i)
when ">t+" when ">t+"
return date_range_clause(db_table, db_field, v.first.to_i, nil) sql = date_range_clause(db_table, db_field, v.first.to_i, nil)
when "<t+" when "<t+"
return date_range_clause(db_table, db_field, 0, v.first.to_i) sql = date_range_clause(db_table, db_field, 0, v.first.to_i)
when "t+" when "t+"
return date_range_clause(db_table, db_field, v.first.to_i, v.first.to_i) sql = date_range_clause(db_table, db_field, v.first.to_i, v.first.to_i)
when "t" when "t"
return date_range_clause(db_table, db_field, 0, 0) sql = date_range_clause(db_table, db_field, 0, 0)
when "w" when "w"
from = l(:general_first_day_of_week) == '7' ? from = l(:general_first_day_of_week) == '7' ?
# week starts on sunday # week starts on sunday
((Date.today.cwday == 7) ? Time.now.at_beginning_of_day : Time.now.at_beginning_of_week - 1.day) : ((Date.today.cwday == 7) ? Time.now.at_beginning_of_day : Time.now.at_beginning_of_week - 1.day) :
# week starts on monday (Rails default) # week starts on monday (Rails default)
Time.now.at_beginning_of_week Time.now.at_beginning_of_week
return "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date(from), connection.quoted_date(from + 7.days)] sql = "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date(from), connection.quoted_date(from + 7.days)]
when "~" when "~"
return "#{db_table}.#{db_field} LIKE '%#{connection.quote_string(v.first)}%'" sql = "#{db_table}.#{db_field} LIKE '%#{connection.quote_string(v.first)}%'"
when "!~" when "!~"
return "#{db_table}.#{db_field} NOT LIKE '%#{connection.quote_string(v.first)}%'" sql = "#{db_table}.#{db_field} NOT LIKE '%#{connection.quote_string(v.first)}%'"
end end
return sql
end end
def add_custom_fields_filters(custom_fields) def add_custom_fields_filters(custom_fields)