Feature #24013 » current_trunk_Decimal_data_type_fix.patch
| app/models/query.rb (date 1485182791000) | ||
|---|---|---|
|
int_values = value.first.to_s.scan(/[+-]?\d+/).map(&:to_i).join(",")
|
||
|
if int_values.present?
|
||
|
if is_custom_filter
|
||
|
sql = "(#{db_table}.#{db_field} <> '' AND CAST(CASE #{db_table}.#{db_field} WHEN '' THEN '0' ELSE #{db_table}.#{db_field} END AS decimal(30,3)) IN (#{int_values}))"
|
||
|
sql = "(#{db_table}.#{db_field} <> '' AND CAST(CASE #{db_table}.#{db_field} WHEN '' THEN '0' ELSE #{db_table}.#{db_field} END AS decimal(18,3)) IN (#{int_values}))"
|
||
|
else
|
||
|
sql = "#{db_table}.#{db_field} IN (#{int_values})"
|
||
|
end
|
||
| ... | ... | |
|
end
|
||
|
when :float
|
||
|
if is_custom_filter
|
||
|
sql = "(#{db_table}.#{db_field} <> '' AND CAST(CASE #{db_table}.#{db_field} WHEN '' THEN '0' ELSE #{db_table}.#{db_field} END AS decimal(30,3)) BETWEEN #{value.first.to_f - 1e-5} AND #{value.first.to_f + 1e-5})"
|
||
|
sql = "(#{db_table}.#{db_field} <> '' AND CAST(CASE #{db_table}.#{db_field} WHEN '' THEN '0' ELSE #{db_table}.#{db_field} END AS decimal(18,3)) BETWEEN #{value.first.to_f - 1e-5} AND #{value.first.to_f + 1e-5})"
|
||
|
else
|
||
|
sql = "#{db_table}.#{db_field} BETWEEN #{value.first.to_f - 1e-5} AND #{value.first.to_f + 1e-5}"
|
||
|
end
|
||
| ... | ... | |
|
sql = date_clause(db_table, db_field, parse_date(value.first), nil, is_custom_filter)
|
||
|
else
|
||
|
if is_custom_filter
|
||
|
sql = "(#{db_table}.#{db_field} <> '' AND CAST(CASE #{db_table}.#{db_field} WHEN '' THEN '0' ELSE #{db_table}.#{db_field} END AS decimal(30,3)) >= #{value.first.to_f})"
|
||
|
sql = "(#{db_table}.#{db_field} <> '' AND CAST(CASE #{db_table}.#{db_field} WHEN '' THEN '0' ELSE #{db_table}.#{db_field} END AS decimal(18,3)) >= #{value.first.to_f})"
|
||
|
else
|
||
|
sql = "#{db_table}.#{db_field} >= #{value.first.to_f}"
|
||
|
end
|
||
| ... | ... | |
|
sql = date_clause(db_table, db_field, nil, parse_date(value.first), is_custom_filter)
|
||
|
else
|
||
|
if is_custom_filter
|
||
|
sql = "(#{db_table}.#{db_field} <> '' AND CAST(CASE #{db_table}.#{db_field} WHEN '' THEN '0' ELSE #{db_table}.#{db_field} END AS decimal(30,3)) <= #{value.first.to_f})"
|
||
|
sql = "(#{db_table}.#{db_field} <> '' AND CAST(CASE #{db_table}.#{db_field} WHEN '' THEN '0' ELSE #{db_table}.#{db_field} END AS decimal(18,3)) <= #{value.first.to_f})"
|
||
|
else
|
||
|
sql = "#{db_table}.#{db_field} <= #{value.first.to_f}"
|
||
|
end
|
||
| ... | ... | |
|
sql = date_clause(db_table, db_field, parse_date(value[0]), parse_date(value[1]), is_custom_filter)
|
||
|
else
|
||
|
if is_custom_filter
|
||
|
sql = "(#{db_table}.#{db_field} <> '' AND CAST(CASE #{db_table}.#{db_field} WHEN '' THEN '0' ELSE #{db_table}.#{db_field} END AS decimal(30,3)) BETWEEN #{value[0].to_f} AND #{value[1].to_f})"
|
||
|
sql = "(#{db_table}.#{db_field} <> '' AND CAST(CASE #{db_table}.#{db_field} WHEN '' THEN '0' ELSE #{db_table}.#{db_field} END AS decimal(18,3)) BETWEEN #{value[0].to_f} AND #{value[1].to_f})"
|
||
|
else
|
||
|
sql = "#{db_table}.#{db_field} BETWEEN #{value[0].to_f} AND #{value[1].to_f}"
|
||
|
end
|
||
| lib/redmine/field_format.rb (date 1485182791000) | ||
|---|---|---|
|
# Postgresql will raise an error if a value can not be casted!
|
||
|
# CustomValue validations should ensure that it doesn't occur
|
||
|
value_col = 'value'.quote_column_name
|
||
|
"CAST(CASE #{join_alias custom_field}.#{value_col} WHEN '' THEN '0' ELSE #{join_alias custom_field}.#{value_col} END AS decimal(30,3))"
|
||
|
"CAST(CASE #{join_alias custom_field}.#{value_col} WHEN '' THEN '0' ELSE #{join_alias custom_field}.#{value_col} END AS decimal(18,3))"
|
||
|
end
|
||
|
|
||
|
# Returns totals for the given scope
|
||
| ... | ... | |
|
scope.joins(:custom_values).
|
||
|
where(:custom_values => {:custom_field_id => custom_field.id}).
|
||
|
where.not(:custom_values => {:value => ''}).
|
||
|
sum("CAST(#{CustomValue.table_name}.#{'value'.quote_column_name} AS decimal(30,3))")
|
||
|
sum("CAST(#{CustomValue.table_name}.#{'value'.quote_column_name} AS decimal(18,3))")
|
||
|
end
|
||
|
|
||
|
def cast_total_value(custom_field, value)
|
||