aboutsummaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@verizonmedia.com>2020-01-27 15:05:41 +0100
committerJon Bratseth <bratseth@verizonmedia.com>2020-01-27 15:05:41 +0100
commit21093f7aebd776713e2c369a4e9c5cf235c0d2f2 (patch)
tree86953b5f8b8e02a704e1ad6d9a6b2c9b6a034a03 /config-model
parent0f351480627ee6c1ab034b5791e4d67350c79015 (diff)
Support quoted string query-commands in fields
Diffstat (limited to 'config-model')
-rw-r--r--config-model/src/main/javacc/SDParser.jj2
-rw-r--r--config-model/src/test/derived/indexschema/index-info.cfg2
-rw-r--r--config-model/src/test/derived/indexschema/indexschema.sd1
3 files changed, 4 insertions, 1 deletions
diff --git a/config-model/src/main/javacc/SDParser.jj b/config-model/src/main/javacc/SDParser.jj
index 52665ff56a9..9468ce47a2c 100644
--- a/config-model/src/main/javacc/SDParser.jj
+++ b/config-model/src/main/javacc/SDParser.jj
@@ -1531,7 +1531,7 @@ void queryCommand(FieldOperationContainer container) :
QueryCommandOperation field = new QueryCommandOperation();
}
{
- <QUERYCOMMAND> <COLON> command = identifierWithDash()
+ <QUERYCOMMAND> <COLON> ( command = identifierWithDash() | command = quotedString() )
{
field.addQueryCommand(command);
container.addOperation(field);
diff --git a/config-model/src/test/derived/indexschema/index-info.cfg b/config-model/src/test/derived/indexschema/index-info.cfg
index a83ec45c5e9..25c7e9db4b0 100644
--- a/config-model/src/test/derived/indexschema/index-info.cfg
+++ b/config-model/src/test/derived/indexschema/index-info.cfg
@@ -45,6 +45,8 @@ indexinfo[].command[].indexname "sd"
indexinfo[].command[].command "plain-tokens"
indexinfo[].command[].indexname "sd"
indexinfo[].command[].command "literal-boost"
+indexinfo[].command[].command "phrase-segmenting false"
+indexinfo[].command[].indexname "sd"
indexinfo[].command[].indexname "pos.x"
indexinfo[].command[].command "index"
indexinfo[].command[].indexname "pos.x"
diff --git a/config-model/src/test/derived/indexschema/indexschema.sd b/config-model/src/test/derived/indexschema/indexschema.sd
index 49f0f7dfca6..d0773accf33 100644
--- a/config-model/src/test/derived/indexschema/indexschema.sd
+++ b/config-model/src/test/derived/indexschema/indexschema.sd
@@ -24,6 +24,7 @@ search indexschema {
field sd type string {
indexing: index
rank:literal
+ query-command: "phrase-segmenting false"
}
field pos type position {
indexing: attribute