Kouhei Sutou
null+****@clear*****
Thu Apr 27 11:04:36 JST 2017
Kouhei Sutou 2017-04-27 11:04:36 +0900 (Thu, 27 Apr 2017) New Revision: 4d08ec3fd0be685d07ff6e9651c67a1f8f6032e1 https://github.com/ranguba/groonga-client/commit/4d08ec3fd0be685d07ff6e9651c67a1f8f6032e1 Message: Remove needless FilterGeoInCircleParameter Modified files: lib/groonga/client/request/select.rb Modified: lib/groonga/client/request/select.rb (+10 -30) =================================================================== --- lib/groonga/client/request/select.rb 2017-04-27 11:01:29 +0900 (61ae6d6) +++ lib/groonga/client/request/select.rb 2017-04-27 11:04:36 +0900 (9277792) @@ -256,11 +256,16 @@ module Groonga center, radius_or_point, approximate_type="rectangle") - parameter = FilterGeoInCircleParameter.new(column_name_or_point, - center, - radius_or_point, - approximate_type) - add_parameter(FilterMerger, parameter) + expression = "geo_in_circle(%{column_name_or_point}" + expression << ", %{center}" + expression << ", %{radius_or_point}" + expression << ", %{approximate_type}" + expression << ")" + @request.filter(expression, + column_name_or_point: column_name_or_point, + center: center, + radius_or_point: radius_or_point, + approximate_type: approximate_type) end # Adds a `between` condition then return a new `select` @@ -592,31 +597,6 @@ module Groonga end end - # @private - class FilterGeoInCircleParameter - include ScriptSyntaxValueEscapable - - def initialize(point, - center, radious, - approximate_type) - @point = point - @center = center - @radious = radious - @approximate_type = approximate_type - end - - def to_parameters - filter = "geo_in_circle(#{escape_script_syntax_value(@point)}" - filter << ", #{escape_script_syntax_value(@center)}" - filter << ", #{escape_script_syntax_value(@radious)}" - filter << ", #{escape_script_syntax_value(@approximate_type)}" - filter << ")" - { - filter: filter, - } - end - end - class FilterBetweenParameter include ScriptSyntaxValueEscapable -------------- next part -------------- HTML����������������������������...Download