diff --git a/src/parser/analyzer.c b/src/parser/analyzer.c
index e03cbdbc3d2e9ff259e9d18f6729bf9751e920b7..dea83d7e0c828d8966fbffe9e91a2895c466fdf7 100644 (file)
--- a/src/parser/analyzer.c
+++ b/src/parser/analyzer.c
break;
case SDB_AST_ISNULL:
break;
case SDB_AST_ISNULL:
+ case SDB_AST_ISTRUE:
+ case SDB_AST_ISFALSE:
if (analyze_node(context, op->right, errbuf))
return -1;
break;
if (analyze_node(context, op->right, errbuf))
return -1;
break;
return -1;
}
return -1;
}
- if ((context != SDB_ATTRIBUTE) && (v->type == SDB_FIELD_VALUE)) {
- sdb_strbuf_sprintf(errbuf, "Invalid expression %s.value",
- SDB_FIELD_TO_NAME(v->type));
- return -1;
+ if (context != UNSPEC_CONTEXT) {
+ /* skip these checks if we don't know the context; it's up to the
+ * caller to check again once the right context information is
+ * available */
+ if ((context != SDB_ATTRIBUTE) && (v->type == SDB_FIELD_VALUE)) {
+ sdb_strbuf_sprintf(errbuf, "Invalid expression %s.value",
+ SDB_FIELD_TO_NAME(context));
+ return -1;
+ }
+ if ((context != SDB_METRIC) && (v->type == SDB_FIELD_TIMESERIES)) {
+ sdb_strbuf_sprintf(errbuf, "Invalid expression %s.timeseries",
+ SDB_FIELD_TO_NAME(context));
+ return -1;
+ }
}
return 0;
} /* analyze_value */
}
return 0;
} /* analyze_value */