Issue 426 (#427)

* #426: Remove support for $currentShape and $shapesGraph

* #426: Editorial fixes

* Update shacl12-sparql/index.html

Co-authored-by: Andy Seaborne <[email protected]>

---------

Co-authored-by: Andy Seaborne <[email protected]>

Author: HolgerKnublauch

shacl12-sparql/index.html

@@ -1046,8 +1046,7 @@ <h3>Validation with SPARQL-based Constraints</h3>
 						There are no validation results if the <a>SPARQL-based constraint</a> has <code>true</code>
 						as a <a>value</a> for the property <code>sh:deactivated</code>.
 						Otherwise, execute the SPARQL query specified by the <a>SPARQL-based constraint</a> <code>$sparql</code>
-						<a>pre-binding</a> the variables <code>this</code> and, if supported,
-						<code>shapesGraph</code> and <code>currentShape</code> as described in <a href="#sparql-constraints-prebound"></a>. 
+						<a>pre-binding</a> the variable <code>this</code> as described in <a href="#sparql-constraints-prebound"></a>.
 						If the <a>shape</a> is a <a>property shape</a>, then prior to execution
 						<dfn data-lt="substituted">substitute</dfn> the variable <code>PATH</code> where it appears in the <a>predicate</a>
 						position of a <a data-cite="sparql12-query/#QSynTriples">triple pattern</a>
@@ -1059,42 +1058,13 @@ <h3>Validation with SPARQL-based Constraints</h3>
 					</div>
 				</div>
 				<section id="sparql-constraints-prebound">
-					<h4>Pre-bound Variables in SPARQL Constraints ($this, $shapesGraph, $currentShape)</h4>
+					<h4>Pre-bound variable $this in SPARQL Constraints</h4>
 					<p>
 						When the SPARQL queries of <a>SPARQL-based constraints</a> and the <a>validators</a>
 						of <a>SPARQL-based constraint components</a> are <a data-cite="shacl12-core/#validation-definition">processed</a>,
-						the SHACL-SPARQL processor <a>pre-binds</a> values for the variables in the following table.
+						the SHACL-SPARQL processor <a>pre-binds</a> values for the variable <code>$this</code>
+						to the current <a>focus node</a>.
 					</p>
-					<table class="term-table">
-						<tr>
-							<th>Variable</th>
-							<th>Interpretation</th>
-						</tr>
-						<tr>
-							<td><code>this</code></td>
-							<td>
-								The <a>focus node</a>.
-							</td>
-						</tr>
-						<tr>
-							<td><code style="white-space: nowrap">shapesGraph</code> (Optional)</td>
-							<td>
-								Can be used to query the shapes graph as in <code>GRAPH $shapesGraph { ... }</code>.
-								If the shapes graph is a named graph in the same dataset as the data graph then it is the <a>IRI</a> of the shapes graph in the dataset.
-								Not all SHACL-SPARQL processors need to support this variable.
-								Processors that do not support the variable <code>shapesGraph</code> MUST report a <a>failure</a> if they encounter a query that references this variable.
-								Use of <code>GRAPH $shapesGraph { ... }</code> should be handled with extreme caution.
-								It may result in constraints that are not interoperable across different SHACL-SPARQL processors and that may not run on remote RDF datasets.
-							</td>
-						</tr>
-						<tr>
-							<td><code style="white-space: nowrap">currentShape</code> (Optional)</td>
-							<td>
-								The current <a>shape</a>.  Typically used in conjunction with the variable <code>shapesGraph</code>.
-								The same support policies as for <code>shapesGraph</code> apply for this variable.
-							</td>
-						</tr>
-					</table>
 				</section>
 				<section id="sparql-constraints-variables">
 					<h4>Mapping of Solution Bindings to Result Properties</h4>
@@ -1284,7 +1254,7 @@ <h4>Parameter Declarations (sh:parameter)</h4>
 					</p>
 					<p class="syntax">
 						<span data-syntax-rule="parameter-name-VARNAME">Every <a>parameter name</a> is a valid <a data-cite="sparql12-query/#rVARNAME">SPARQL VARNAME</a>.</span>
-						<span data-syntax-rule="parameter-name-not-in"><a>Parameter names</a> must not be one of the following: <code>this</code>, <code>shapesGraph</code>, <code>currentShape</code>, <code>path</code>, <code>PATH</code>, <code>value</code>.</span>
+						<span data-syntax-rule="parameter-name-not-in"><a>Parameter names</a> must not be one of the following: <code>this</code>, <code>path</code>, <code>PATH</code>, <code>value</code>.</span>
 						<span data-syntax-rule="parameter-name-unique">A constraint component where two or more <a>parameter declarations</a> use the same <a>parameter names</a> is <a>ill-formed</a>.</span>
 					</p>
 					<p class="syntax">
@@ -1584,9 +1554,8 @@ <h3>Validation with SPARQL-based Constraint Components</h3>
 					</li>
 				</ul>
 				<p>
-					The SPARQL query executions above MUST <a>pre-bind</a> the variables
-					<code>this</code> and, if supported, <code>shapesGraph</code> and <code>currentShape</code>
-					as described in <a href="#sparql-constraints-prebound"></a>.
+					The SPARQL query executions above MUST <a>pre-bind</a> the variable
+					<code>this</code> as described in <a href="#sparql-constraints-prebound"></a>.
 					In addition, each <a>value</a> of a <a>parameter</a> of the <a>constraint component</a> in the <a>constraint</a>
 					MUST be <a>pre-bound</a> as a variable that has the <a>parameter name</a> as its name.
 				</p>
@@ -2014,7 +1983,7 @@ <h2>Pre-binding of Variables in SPARQL Queries</h2>
 					SHACL-SPARQL processors MUST report a <a>failure</a> when it is operating on a <a>shapes graph</a>
 					that contains SHACL-SPARQL queries (via <code>sh:select</code> and <code>sh:ask</code>) that violate any of these restrictions.
 					Note that the term <em>potentially pre-bound variables</em> includes the variables <code>this</code>,
-					<code>shapesGraph</code>, <code>currentShape</code>, <code>value</code> (for ASK queries),
+					<code>value</code> (for ASK queries),
 					and any variables that represent the <a>parameters</a> of the <a>constraint component</a> that uses the query.
 					<!-- This is so that the checking can be performed once, not required each time. -->
 				</p>
@@ -2273,21 +2242,6 @@ <h3>sh:lessThanOrEquals</h3>
 	$this $lessThanOrEquals ?otherValue .
 	BIND (?value &lt;= ?otherValue AS ?result) .
 	FILTER (!bound(?result) || !(?result)) .
-}</pre>
-				</div>
-			</section>
-			<section id="sparql-definition-in">
-				<h3>sh:in</h3>
-				<p>
-					The following query expresses a potential SPARQL-based validator for <a data-cite="shacl12-core#InConstraintComponent">sh:in</a>.
-				</p>
-				<div class="def def-sparql">
-					<div class="def-header">POTENTIAL DEFINITION IN SPARQL (Must evaluate to true for each value node $value)</div>
-<pre class="def-sparql-body">
-ASK {
-	GRAPH $shapesGraph {
-		$in (rdf:rest*)/rdf:first $value .
-	}
 }</pre>
 				</div>
 			</section>
@@ -2335,6 +2289,7 @@ <h2>Changes between SHACL 1.0 SPARQL and SHACL 1.2 SPARQL Extensions</h2>
 				<li>Added support for <a>annotation properties</a>, see <a href="https://github.com/w3c/data-shapes/issues/327">Issue 327</a></li>
 				<li>Added the <a>node expression function</a> <a href="#SPARQLExprExpression"><code>sh:SPARQLExprExpression</code></a>, see <a href="https://github.com/w3c/data-shapes/issues/315">Issue 315</a></li>
 				<li>Clarified that VALUES clauses are only disallowed when they mention <a href="#pre-binding">pre-bound variables</a> and removed the restriction on sub-SELECTs, see <a href="https://github.com/w3c/data-shapes/issues/159">Issue 159</a></li>
+				<li>Removed support for the optional pre-bound variables <code>shapesGraph</code> and <code>currentShape</code>, see <a href="https://github.com/w3c/data-shapes/issues/426">Issue 426</a></li>
 			</ul>
 		</section>		
 

shacl12-test-suite/tests/sparql/pre-binding/manifest.ttl

@@ -12,7 +12,6 @@
 	mf:include <pre-binding-005.ttl> ;
 	mf:include <pre-binding-006.ttl> ;
 	mf:include <pre-binding-007.ttl> ;
-	mf:include <shapesGraph-001.ttl> ;
 	mf:include <unsupported-sparql-001.ttl> ;
 	mf:include <unsupported-sparql-002.ttl> ;
 	mf:include <unsupported-sparql-003.ttl> ;