From 77721f111d7c2c7beeb779351513fcd913fbfecd Mon Sep 17 00:00:00 2001 From: Julian Mundhahs Date: Tue, 22 Oct 2024 14:06:44 +0200 Subject: [PATCH] fix --- .../sparqlParser/SparqlQleverVisitor.cpp | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/parser/sparqlParser/SparqlQleverVisitor.cpp b/src/parser/sparqlParser/SparqlQleverVisitor.cpp index 92b7a8d86a..e01ce42e30 100644 --- a/src/parser/sparqlParser/SparqlQleverVisitor.cpp +++ b/src/parser/sparqlParser/SparqlQleverVisitor.cpp @@ -399,9 +399,8 @@ ParsedQuery Visitor::visit(Parser::Update1Context* ctx) { checkTriples(graphUpdate.toInsert_); parsedQuery_._clause = parsedQuery::UpdateClause{std::move(graphUpdate)}; parsedQuery_._rootGraphPattern = std::move(pattern); - // TODO once #1538 is merged - // parsedQuery_.datasetClauses_ = - // parsedQuery::DatasetClauses::fromClauses(usingClauses); + parsedQuery_.datasetClauses_ = + parsedQuery::DatasetClauses::fromClauses(usingClauses); } else { parsedQuery_._clause = visitAlternative( ctx->load(), ctx->clear(), ctx->drop(), ctx->create(), ctx->add(), @@ -462,8 +461,8 @@ GraphUpdate Visitor::visit(Parser::DeleteDataContext* ctx) { } // ____________________________________________________________________________________ -std::tuple, vector> +std::tuple, + vector> Visitor::visit(Parser::DeleteWhereContext* ctx) { auto triples = visit(ctx->quadPattern()); auto registerIfVariable = [this](const TripleComponent& component) { @@ -490,14 +489,13 @@ Visitor::visit(Parser::DeleteWhereContext* ctx) { std::exchange(visibleVariables_, std::move(visibleVariablesSoFar)); return std::make_tuple(GraphUpdate{{}, std::move(triples)}, - std::move(pattern), - std::vector{}, + std::move(pattern), std::vector{}, std::move(visibleVariablesWhereClause)); } // ____________________________________________________________________________________ -std::tuple, vector> +std::tuple, + vector> Visitor::visit(Parser::ModifyContext* ctx) { std::vector visibleVariablesSoFar = std::move(visibleVariables_); auto graphPattern = visit(ctx->groupGraphPattern()); @@ -989,8 +987,7 @@ string Visitor::visit(Parser::PnameNsContext* ctx) { } // ____________________________________________________________________________________ -SparqlQleverVisitor::DatasetClause SparqlQleverVisitor::visit( - Parser::UsingClauseContext* ctx) { +DatasetClause SparqlQleverVisitor::visit(Parser::UsingClauseContext* ctx) { if (ctx->NAMED()) { return {.dataset_ = visit(ctx->iri()), .isNamed_ = true}; } else {