index 923ce066e498b90ab41e7754020e04d3d4dd55ff..14d2209a933e0e398a620532a419fae0c27e0e19 100644 (file)
#include "core/store.h"
#include "core/store-private.h"
-#include "frontend/parser.h"
+#include "parser/parser.h"
#include "testutils.h"
#include <assert.h>
sdb_data_t d = { SDB_TYPE_STRING, { .string = "a" } };
sdb_store_expr_t *e = sdb_store_expr_constvalue(&d);
- sdb_store_matcher_t *always = sdb_store_isnnull_matcher(e);
sdb_store_matcher_t *never = sdb_store_isnull_matcher(e);
+ sdb_store_matcher_t *always = sdb_store_inv_matcher(never);
struct {
const char *op;
{ "ANY attribute.name = 'x'", NULL, 0 },
{ "ANY attribute.name =~ 'x'", NULL, 0 },
{ "ALL attribute.name = 'k1'", NULL, 2 },
+ { "ANY attribute.value = 'v1'", NULL, 1 },
+ { "ANY attribute.value =~ 'v'", NULL, 2 },
+ { "ANY attribute.value = 123", NULL, 1 },
{ "host.name = 'a'", NULL, 1 },
{ "host.attribute['k1'] =~ 'v1'",
NULL, 1 },
{
sdb_strbuf_t *errbuf = sdb_strbuf_create(64);
sdb_store_matcher_t *m, *filter = NULL;
+ sdb_ast_node_t *ast;
int check, n;
n = 0;
fail_unless(n == 3,
"sdb_store_scan called callback %d times; expected: 3", (int)n);
- m = sdb_fe_parse_matcher(scan_data[_i].query, -1, errbuf);
+ ast = sdb_parser_parse_conditional(scan_data[_i].query, -1, errbuf);
+ m = sdb_store_query_prepare_matcher(ast);
+ sdb_object_deref(SDB_OBJ(ast));
fail_unless(m != NULL,
- "sdb_fe_parse_matcher(%s, -1) = NULL; expected: <matcher> "
+ "sdb_parser_parse_conditional(%s, -1) = NULL; expected: <ast> "
"(parser error: %s)", scan_data[_i].query,
sdb_strbuf_string(errbuf));
if (scan_data[_i].filter) {
- filter = sdb_fe_parse_matcher(scan_data[_i].filter, -1, errbuf);
+ ast = sdb_parser_parse_conditional(scan_data[_i].filter, -1, errbuf);
+ filter = sdb_store_query_prepare_matcher(ast);
+ sdb_object_deref(SDB_OBJ(ast));
fail_unless(filter != NULL,
- "sdb_fe_parse_matcher(%s, -1) = NULL; "
- "expected: <matcher> (parser error: %s)",
+ "sdb_parser_parse_conditional(%s, -1) = NULL; "
+ "expected: <ast> (parser error: %s)",
scan_data[_i].filter, sdb_strbuf_string(errbuf));
}