Change fieldset query-command to add, not override commands

The logic in FieldSet stated that any explicit query-command
will deactivate all the standard derived commands. That is
inconsistent with query-command on fields, not mentioned in
the doc, and will generally break things.

This changes to the normal behavior where query-commands are
additive.

1 files changed, 5 insertions, 0 deletions

diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExportingTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExportingTestCase.java
index 61065cd4bcc..3fc05d789f6 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExportingTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExportingTestCase.java
@@ -120,6 +120,11 @@ public class ExportingTestCase extends AbstractExportingTestCase {
     }
 
     @Test
+    public void testFieldSet2() throws IOException, ParseException {
+        assertCorrectDeriving("fieldset2");
+    }
+
+    @Test
     public void testIndexinfoFieldsets() throws IOException, ParseException {
         assertCorrectDeriving("indexinfo_fieldsets");
     }