YUKI Hiroshi
null+****@clear*****
Fri Oct 31 14:14:44 JST 2014
YUKI Hiroshi 2014-10-31 14:14:44 +0900 (Fri, 31 Oct 2014) New Revision: 8060ea83006b53ebb65ea9714589dfeb8c5544fa https://github.com/droonga/droonga-engine/commit/8060ea83006b53ebb65ea9714589dfeb8c5544fa Message: Detect whitespace-separated args of functiosn correctly Modified files: lib/droonga/plugins/groonga/select.rb test/unit/plugins/groonga/select/test_adapter_input.rb Modified: lib/droonga/plugins/groonga/select.rb (+4 -2) =================================================================== --- lib/droonga/plugins/groonga/select.rb 2014-10-31 14:09:15 +0900 (6ea2215) +++ lib/droonga/plugins/groonga/select.rb 2014-10-31 14:14:44 +0900 (e535f2e) @@ -166,11 +166,13 @@ module Droonga queries end - COMMAND_VERSION_1_OUTPUT_COLUMNS_PATTERN = /\A[^\s,]+(\s+[^\s,]+)+\z/ + # for a backward compatibility for command_version=1, + # whitespace-separeted case (without functions) should be accepted. + COMMAND_VERSION_1_ONLY_PATTERN = /\A[^\s,()]+(\s+[^\s,()]+)+\z/ def convert_output_columns(output_columns) output_columns = output_columns.strip - command_version_is_1 = output_columns =~ COMMAND_VERSION_1_OUTPUT_COLUMNS_PATTERN + command_version_is_1 = output_columns =~ COMMAND_VERSION_1_ONLY_PATTERN if command_version_is_1 output_columns.split(/\s+/) else Modified: test/unit/plugins/groonga/select/test_adapter_input.rb (+4 -0) =================================================================== --- test/unit/plugins/groonga/select/test_adapter_input.rb 2014-10-31 14:09:15 +0900 (0bee395) +++ test/unit/plugins/groonga/select/test_adapter_input.rb 2014-10-31 14:14:44 +0900 (ad3b9d3) @@ -69,6 +69,10 @@ class GroongaSelectAdapterInputTest < Test::Unit::TestCase def test_whiet_space_separated assert_attributes(["_id","_key"], "_id _key") end + + def test_whiet_space_separated_arguments + assert_attributes(["_id","_key","snippet_html( content )"], "_id,_key,snippet_html( content )") + end end end -------------- next part -------------- HTML����������������������������...Download