Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

disable yield var #3271

Merged
merged 19 commits into from
Nov 24, 2021
Merged
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions src/parser/parser.yy
Original file line number Diff line number Diff line change
@@ -1437,9 +1437,26 @@ yield_column
delete $3;
}
| expression {
auto vars = graph::ExpressionUtils::collectAll($1, {Expression::Kind::kVar});
if (!vars.empty()) {
for (auto* var : vars) {
if (!static_cast<const VariableExpression*>(var)->isInner()) {
throw nebula::GraphParser::syntax_error(@1, "Direct output of variable is prohibited");
}
}
}
$$ = new YieldColumn($1);
}
| expression KW_AS name_label {
auto vars = graph::ExpressionUtils::collectAll($1, {Expression::Kind::kVar});
if (!vars.empty()) {
for (auto* var : vars) {
if (!static_cast<const VariableExpression*>(var)->isInner()) {
delete $3;
throw nebula::GraphParser::syntax_error(@1, "Direct output of variable is prohibited");
}
}
}
czpmango marked this conversation as resolved.
Show resolved Hide resolved
$$ = new YieldColumn($1, *$3);
delete $3;
}
26 changes: 26 additions & 0 deletions tests/tck/features/bugfix/VariableExpression.feature
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Copyright (c) 2021 vesoft inc. All rights reserved.
#
# This source code is licensed under Apache 2.0 License,
# attached with Common Clause Condition 1.0, found in the LICENSES directory.
czpmango marked this conversation as resolved.
Show resolved Hide resolved
Feature: Variable usage

Background:
Given a graph with space named "nba"

Scenario: disable yield $var
When executing query:
"""
$var = yield 1;$var2 = yield 3;yield $var1 + $var2
"""
Then a SyntaxError should be raised at runtime: Direct output of variable is prohibited near `$var1 + $var2'
When executing query:
"""
$var=go from "Tim Duncan" over like yield like._dst as dst;yield $var
"""
Then a SyntaxError should be raised at runtime: Direct output of variable is prohibited near `$var'
Then drop the used space
When executing query:
"""
$var=go from "Tim Duncan" over like yield like._dst as dst;yield $var[0][0]
"""
Then a SyntaxError should be raised at runtime: Direct output of variable is prohibited near `$var[0][0]'
2 changes: 1 addition & 1 deletion tests/tck/features/go/GroupbyLimit.IntVid.feature
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ Feature: Groupby & limit Sentence
"""
GO FROM hash("Marco Belinelli") OVER serve YIELD $$.team.name AS name | GROUP BY $-.start_year YIELD COUNT($var)
"""
Then a SemanticError should be raised at runtime:
Then a SyntaxError should be raised at runtime:

Scenario: Syntax test4
When executing query:
2 changes: 1 addition & 1 deletion tests/tck/features/go/GroupbyLimit.feature
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ Feature: Groupby & limit Sentence
"""
GO FROM "Marco Belinelli" OVER serve YIELD $$.team.name AS name | GROUP BY $-.start_year YIELD COUNT($var)
"""
Then a SemanticError should be raised at runtime:
Then a SyntaxError should be raised at runtime:

Scenario: Syntax test4
When executing query: