jro_apps/redmine Commit - r2088:ea77929d62a3

Refactor: Extracted new method Query#sql_for_field from Query#statement in...

Eric Davis -

r2088:ea77929d62a3

parent child

Context file:

r2088:ea77929d62a3

Collapse all files

app/models/query.rb +34 -25

                     v.push(User.current.logged? ? User.current.id.to_s : "0") if v.delete("me")
                   end
+                  sql = sql + sql_for_field(field, v, db_table, db_field, is_custom_filter)
+                  sql << ')'
+                  filters_clauses << sql
+                end if filters and valid?
+                (filters_clauses << project_statement).join(' AND ')
+              end
+              private
+              # Helper method to generate the WHERE sql for a +field+ with a value (+v+)
+              def sql_for_field(field, v, db_table, db_field, is_custom_filter)
+                sql = ''
                 case operator_for field
                 when "="
-                    sql = sql + "#{db_table}.#{db_field} IN (" + v.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + ")"
+                  return "#{db_table}.#{db_field} IN (" + v.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + ")"
                 when "!"
-                    sql = sql + "(#{db_table}.#{db_field} IS NULL OR #{db_table}.#{db_field} NOT IN (" + v.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + "))"
+                  return "(#{db_table}.#{db_field} IS NULL OR #{db_table}.#{db_field} NOT IN (" + v.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + "))"
                 when "!*"
-                    sql = sql + "#{db_table}.#{db_field} IS NULL"
+                  sql = "#{db_table}.#{db_field} IS NULL"
                   sql << " OR #{db_table}.#{db_field} = ''" if is_custom_filter
+                  return sql
                 when "*"
-                    sql = 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
+                  return sql
                 when ">="
-                    sql = sql + "#{db_table}.#{db_field} >= #{v.first.to_i}"
+                  return "#{db_table}.#{db_field} >= #{v.first.to_i}"
                 when "<="
-                    sql = sql + "#{db_table}.#{db_field} <= #{v.first.to_i}"
+                  return "#{db_table}.#{db_field} <= #{v.first.to_i}"
                 when "o"
-                    sql = sql + "#{IssueStatus.table_name}.is_closed=#{connection.quoted_false}" if field == "status_id"
+                  return "#{IssueStatus.table_name}.is_closed=#{connection.quoted_false}" if field == "status_id"
                 when "c"
-                    sql = sql + "#{IssueStatus.table_name}.is_closed=#{connection.quoted_true}" if field == "status_id"
+                  return "#{IssueStatus.table_name}.is_closed=#{connection.quoted_true}" if field == "status_id"
                 when ">t-"
-                    sql = sql + date_range_clause(db_table, db_field, - v.first.to_i, 0)
+                  return date_range_clause(db_table, db_field, - v.first.to_i, 0)
                 when "<t-"
-                    sql = sql + date_range_clause(db_table, db_field, nil, - v.first.to_i)
+                  return date_range_clause(db_table, db_field, nil, - v.first.to_i)
                 when "t-"
-                    sql = sql + date_range_clause(db_table, db_field, - v.first.to_i, - v.first.to_i)
+                  return date_range_clause(db_table, db_field, - v.first.to_i, - v.first.to_i)
                 when ">t+"
-                    sql = sql + date_range_clause(db_table, db_field, v.first.to_i, nil)
+                  return date_range_clause(db_table, db_field, v.first.to_i, nil)
                 when "<t+"
-                    sql = sql + date_range_clause(db_table, db_field, 0, v.first.to_i)
+                  return date_range_clause(db_table, db_field, 0, v.first.to_i)
                 when "t+"
-                    sql = sql + date_range_clause(db_table, db_field, v.first.to_i, v.first.to_i)
+                  return date_range_clause(db_table, db_field, v.first.to_i, v.first.to_i)
                 when "t"
-                    sql = sql + date_range_clause(db_table, db_field, 0, 0)
+                  return date_range_clause(db_table, db_field, 0, 0)
                 when "w"
                   from = l(:general_first_day_of_week) == '7' ?
                   # week starts on sunday
                   ((Date.today.cwday == 7) ? Time.now.at_beginning_of_day : Time.now.at_beginning_of_week - 1.day) :
                     # week starts on monday (Rails default)
                     Time.now.at_beginning_of_week
-                    sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date(from), connection.quoted_date(from + 7.days)]
+                  return "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date(from), connection.quoted_date(from + 7.days)]
                 when "~"
-                    sql = sql + "#{db_table}.#{db_field} LIKE '%#{connection.quote_string(v.first)}%'"
+                  return "#{db_table}.#{db_field} LIKE '%#{connection.quote_string(v.first)}%'"
                 when "!~"
-                    sql = sql + "#{db_table}.#{db_field} NOT LIKE '%#{connection.quote_string(v.first)}%'"
+                  return "#{db_table}.#{db_field} NOT LIKE '%#{connection.quote_string(v.first)}%'"
                 end
-                  sql << ')'
-                  filters_clauses << sql
-                end if filters and valid?
-                (filters_clauses << project_statement).join(' AND ')
               end
-              private
               def add_custom_fields_filters(custom_fields)
                 @available_filters ||= {}

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