Navigation Menu

Skip to content

Commit

Permalink
Stop to use needless variable length arguments
Browse files Browse the repository at this point in the history
  • Loading branch information
kou committed Apr 26, 2017
1 parent 7ed54bb commit fa1d2d1
Showing 1 changed file with 14 additions and 8 deletions.
22 changes: 14 additions & 8 deletions lib/groonga/client/request/select.rb
Expand Up @@ -509,19 +509,25 @@ def initialize(expression, values)
class FilterBetweenParameter
include ScriptSyntaxValueEscapable

def initialize(column_name, *values)
def initialize(column_name,
min, min_border,
max, max_border)
@column_name = column_name
@values = values
@min = min
@min_border = min_border
@max = max
@max_border = max_border
end

def to_parameters
return {} if @values.empty?

escaped_values = @values.collect do |value|
escape_script_syntax_value(value)
end
filter = "between(#{@column_name}"
filter << ", #{escape_script_syntax_value(@min)}"
filter << ", #{escape_script_syntax_value(@min_border)}"
filter << ", #{escape_script_syntax_value(@max)}"
filter << ", #{escape_script_syntax_value(@max_border)}"
filter << ")"
{
filter: "between(#{@column_name}, #{escaped_values.join(", ")})",
filter: filter,
}
end
end
Expand Down

0 comments on commit fa1d2d1

Please sign in to comment.