NO_SYNTAX_ERROR: support queries starting with "~"

GitHub: #767
groonga · Oct 10, 2017 · d3f972b · d3f972b
1 parent 272f324
commit d3f972b
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 6 deletions.
diff --git a/lib/expr.c b/lib/expr.c
@@ -7595,12 +7595,17 @@ parse_query(grn_ctx *ctx, efs_info *q)
       q->cur++;
       break;
     case GRN_QUERY_ADJ_NEG :
-      op->op = GRN_OP_ADJUST;
-      parse_query_accept_adjust(ctx,
-                                q,
-                                q->cur, 1,
-                                GRN_EXPR_TOKEN_NEGATIVE,
-                                -DEFAULT_WEIGHT);
+      if (first_token) {
+        parse_query_flush_pending_token(ctx, q);
+        parse_query_accept_string(ctx, q, q->cur, 1);
+      } else {
+        op->op = GRN_OP_ADJUST;
+        parse_query_accept_adjust(ctx,
+                                  q,
+                                  q->cur, 1,
+                                  GRN_EXPR_TOKEN_NEGATIVE,
+                                  -DEFAULT_WEIGHT);
+      }
       q->cur++;
       break;
     case GRN_QUERY_PARENL :

diff --git a/test/command/suite/select/query_flags/query_no_syntax_error/leading_negative.expected b/test/command/suite/select/query_flags/query_no_syntax_error/leading_negative.expected
@@ -0,0 +1,13 @@
+table_create Names TABLE_PAT_KEY ShortText
+[[0,0.0,0.0],true]
+table_create Tokens TABLE_PAT_KEY ShortText   --default_tokenizer TokenBigram   --normalizer NormalizerAuto
+[[0,0.0,0.0],true]
+column_create Tokens names_key COLUMN_INDEX|WITH_POSITION Names _key
+[[0,0.0,0.0],true]
+load --table Names
+[
+{"_key": "name (x~y)"}
+]
+[[0,0.0,0.0],1]
+select Names   --match_columns "_key"   --query "~y"   --query_flags ALLOW_PRAGMA|ALLOW_COLUMN|QUERY_NO_SYNTAX_ERROR
+[[0,0.0,0.0],[[[1],[["_id","UInt32"],["_key","ShortText"]],[1,"name (x~y)"]]]]
diff --git a/test/command/suite/select/query_flags/query_no_syntax_error/leading_negative.test b/test/command/suite/select/query_flags/query_no_syntax_error/leading_negative.test
@@ -0,0 +1,16 @@
+table_create Names TABLE_PAT_KEY ShortText
+
+table_create Tokens TABLE_PAT_KEY ShortText \
+  --default_tokenizer TokenBigram \
+  --normalizer NormalizerAuto
+column_create Tokens names_key COLUMN_INDEX|WITH_POSITION Names _key
+
+load --table Names
+[
+{"_key": "name (x~y)"}
+]
+
+select Names \
+  --match_columns "_key" \
+  --query "~y" \
+  --query_flags ALLOW_PRAGMA|ALLOW_COLUMN|QUERY_NO_SYNTAX_ERROR