:date_past => [ "=", ">=", "<=", "><", ">t-", "<t-", "t-", "t", "w" ],
:string => [ "=", "~", "!", "!~" ],
:text => [ "~", "!~" ],
+ # TODO: should be :numeric
:integer => [ "=", ">=", "<=", "><", "!*", "*" ] }
cattr_reader :operators_by_filter_type
sql = date_clause(db_table, db_field, (Date.parse(value.first) rescue nil), nil)
else
if is_custom_filter
- sql = "CAST(#{db_table}.#{db_field} AS decimal(60,3)) >= #{value.first.to_i}"
+ sql = "CAST(#{db_table}.#{db_field} AS decimal(60,3)) >= #{value.first.to_f}"
else
- sql = "#{db_table}.#{db_field} >= #{value.first.to_i}"
+ sql = "#{db_table}.#{db_field} >= #{value.first.to_f}"
end
end
when "<="
sql = date_clause(db_table, db_field, nil, (Date.parse(value.first) rescue nil))
else
if is_custom_filter
- sql = "CAST(#{db_table}.#{db_field} AS decimal(60,3)) <= #{value.first.to_i}"
+ sql = "CAST(#{db_table}.#{db_field} AS decimal(60,3)) <= #{value.first.to_f}"
else
- sql = "#{db_table}.#{db_field} <= #{value.first.to_i}"
+ sql = "#{db_table}.#{db_field} <= #{value.first.to_f}"
end
end
when "><"
sql = date_clause(db_table, db_field, (Date.parse(value[0]) rescue nil), (Date.parse(value[1]) rescue nil))
else
if is_custom_filter
- sql = "CAST(#{db_table}.#{db_field} AS decimal(60,3)) BETWEEN #{value[0].to_i} AND #{value[1].to_i}"
+ sql = "CAST(#{db_table}.#{db_field} AS decimal(60,3)) BETWEEN #{value[0].to_f} AND #{value[1].to_f}"
else
- sql = "#{db_table}.#{db_field} BETWEEN #{value[0].to_i} AND #{value[1].to_i}"
+ sql = "#{db_table}.#{db_field} BETWEEN #{value[0].to_f} AND #{value[1].to_f}"
end
end
when "o"
find_issues_with_query(query)
end
+ def test_operator_is_on_float
+ Issue.update_all("estimated_hours = 171.2", "id=2")
+
+ query = Query.new(:name => '_')
+ query.add_filter('estimated_hours', '=', ['171.20'])
+ issues = find_issues_with_query(query)
+ assert_equal 1, issues.size
+ assert_equal 2, issues.first.id
+ end
+
def test_operator_greater_than
query = Query.new(:project => Project.find(1), :name => '_')
query.add_filter('done_ratio', '>=', ['40'])
- assert query.statement.include?("#{Issue.table_name}.done_ratio >= 40")
+ assert query.statement.include?("#{Issue.table_name}.done_ratio >= 40.0")
+ find_issues_with_query(query)
+ end
+
+ def test_operator_greater_than_a_float
+ query = Query.new(:project => Project.find(1), :name => '_')
+ query.add_filter('estimated_hours', '>=', ['40.5'])
+ assert query.statement.include?("#{Issue.table_name}.estimated_hours >= 40.5")
find_issues_with_query(query)
end
f = IssueCustomField.create!(:name => 'filter', :field_format => 'int', :is_filter => true, :is_for_all => true)
query = Query.new(:project => Project.find(1), :name => '_')
query.add_filter("cf_#{f.id}", '>=', ['40'])
- assert query.statement.include?("CAST(custom_values.value AS decimal(60,3)) >= 40")
+ assert query.statement.include?("CAST(custom_values.value AS decimal(60,3)) >= 40.0")
find_issues_with_query(query)
end
def test_operator_lesser_than
query = Query.new(:project => Project.find(1), :name => '_')
query.add_filter('done_ratio', '<=', ['30'])
- assert query.statement.include?("#{Issue.table_name}.done_ratio <= 30")
+ assert query.statement.include?("#{Issue.table_name}.done_ratio <= 30.0")
find_issues_with_query(query)
end
f = IssueCustomField.create!(:name => 'filter', :field_format => 'int', :is_filter => true, :is_for_all => true)
query = Query.new(:project => Project.find(1), :name => '_')
query.add_filter("cf_#{f.id}", '<=', ['30'])
- assert query.statement.include?("CAST(custom_values.value AS decimal(60,3)) <= 30")
+ assert query.statement.include?("CAST(custom_values.value AS decimal(60,3)) <= 30.0")
find_issues_with_query(query)
end
def test_operator_between
query = Query.new(:project => Project.find(1), :name => '_')
query.add_filter('done_ratio', '><', ['30', '40'])
- assert_include "#{Issue.table_name}.done_ratio BETWEEN 30 AND 40", query.statement
+ assert_include "#{Issue.table_name}.done_ratio BETWEEN 30.0 AND 40.0", query.statement
find_issues_with_query(query)
end
f = IssueCustomField.create!(:name => 'filter', :field_format => 'int', :is_filter => true, :is_for_all => true)
query = Query.new(:project => Project.find(1), :name => '_')
query.add_filter("cf_#{f.id}", '><', ['30', '40'])
- assert_include "CAST(custom_values.value AS decimal(60,3)) BETWEEN 30 AND 40", query.statement
+ assert_include "CAST(custom_values.value AS decimal(60,3)) BETWEEN 30.0 AND 40.0", query.statement
find_issues_with_query(query)
end