Skip to content

filter required parameters for query execution #26

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

Merged
merged 5 commits into from
Jan 24, 2017
Merged
Show file tree
Hide file tree
Changes from 4 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

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,9 @@ Variable ::= SymbolicNameString {
}
FunctionName ::= l_identifier
ProcedureName ::= SymbolicNameString
Parameter ::= NewParameter | OldParameter
Parameter ::= NewParameter | OldParameter {
methods=[getParameterName]
}
OldParameter ::= "{" (SymbolicNameString | UnsignedDecimalInteger) "}"
NewParameter ::= "$" (SymbolicNameString | UnsignedDecimalInteger)
NodeLabel ::= ":" LabelName
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,33 @@ public static String getFullName(CypherProcedureInvocation element) {
return element.getProcedureInvocationBody().getText();
}

public static String getParameterName(CypherParameter element) {
CypherNewParameter newParameter = element.getNewParameter();
CypherOldParameter oldParameter = element.getOldParameter();

if (newParameter != null) {
if (newParameter.getSymbolicNameString() != null) {
return newParameter.getSymbolicNameString().getUnescapedSymbolicNameString().getText();
}
if (newParameter.getUnsignedDecimalInteger() != null) {
return newParameter.getUnsignedDecimalInteger().getLInteger().getText();
}
throw new IllegalStateException("New parameter should have symbolic name or unsigned decimal integer value");
}

if (oldParameter != null) {
if (oldParameter.getSymbolicNameString() != null) {
return oldParameter.getSymbolicNameString().getUnescapedSymbolicNameString().getText();
}
if (oldParameter.getUnsignedDecimalInteger() != null) {
return oldParameter.getUnsignedDecimalInteger().getLInteger().getText();
}
throw new IllegalStateException("Old parameter should have symbolic name or unsigned decimal integer value");
}

throw new IllegalStateException("Parameter should have either new parameter or old parameter representation");
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

return "graphbdb-plugin-invalid-parameter-name-should-never-happen";

}

/**
* Safely replaces symbolic name node with new node.
* It's possible that nothing happens if newElement is invalid. No error thrown in such case.
Expand Down
Loading