YUKI Hiroshi
null+****@clear*****
Fri Oct 31 14:09:15 JST 2014
YUKI Hiroshi 2014-10-31 14:09:15 +0900 (Fri, 31 Oct 2014) New Revision: 90ee081035641ff6485b9fa4b6fefb74abe2faf4 https://github.com/droonga/droonga-engine/commit/90ee081035641ff6485b9fa4b6fefb74abe2faf4 Message: Revert "Simplify" This reverts commit a80d0e3713c400ec72852423f4693e6a31b6ea7e. This breakes compatibility... Modified files: lib/droonga/plugins/groonga/select.rb Modified: lib/droonga/plugins/groonga/select.rb (+8 -3) =================================================================== --- lib/droonga/plugins/groonga/select.rb 2014-10-31 14:07:04 +0900 (8527aee) +++ lib/droonga/plugins/groonga/select.rb 2014-10-31 14:09:15 +0900 (6ea2215) @@ -166,11 +166,16 @@ module Droonga queries end + COMMAND_VERSION_1_OUTPUT_COLUMNS_PATTERN = /\A[^\s,]+(\s+[^\s,]+)+\z/ + def convert_output_columns(output_columns) output_columns = output_columns.strip - # for a backward compatibility for command_version=1, - # whitespace-separeted case should be accepted. - output_columns.split(/\s*,\s*|\s+/) + command_version_is_1 = output_columns =~ COMMAND_VERSION_1_OUTPUT_COLUMNS_PATTERN + if command_version_is_1 + output_columns.split(/\s+/) + else + output_columns.split(/\s*,\s*/) + end end end -------------- next part -------------- HTML����������������������������...Download