Skip to content

Commit 015c01e

Browse files
BorderCloudafs
BorderCloud
authored and
afs
committed
xsd:string is the datatype by default and becomes implicit in sparql results
1 parent 7f556ae commit 015c01e

27 files changed

+63
-63
lines changed

‎sparql11/data-sparql11/csv-tsv-res/csvtsv01.tsv

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
?s ?p ?o
22
<http://example.org/s1> <http://example.org/p1> <http://example.org/s2>
33
<http://example.org/s2> <http://example.org/p2> "foo"
4-
<http://example.org/s3> <http://example.org/p3> "bar"^^<http://www.w3.org/2001/XMLSchema#string>
4+
<http://example.org/s3> <http://example.org/p3> "bar"
55
<http://example.org/s4> <http://example.org/p4> 4
66
<http://example.org/s5> <http://example.org/p5> 5.5
77
<http://example.org/s6> <http://example.org/p6> _:b0

‎sparql11/data-sparql11/csv-tsv-res/csvtsv02.tsv

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
?s ?p ?o ?p2 ?o2
22
<http://example.org/s1> <http://example.org/p1> <http://example.org/s2> <http://example.org/p2> "foo"
33
<http://example.org/s2> <http://example.org/p2> "foo"
4-
<http://example.org/s3> <http://example.org/p3> "bar"^^<http://www.w3.org/2001/XMLSchema#string>
4+
<http://example.org/s3> <http://example.org/p3> "bar"
55
<http://example.org/s4> <http://example.org/p4> 4
66
<http://example.org/s5> <http://example.org/p5> 5.5
77
<http://example.org/s6> <http://example.org/p6> _:b0

‎sparql11/data-sparql11/csv-tsv-res/csvtsv03.tsv

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
?s ?p ?o
2-
<http://example.org/s1> <http://example.org/p1> "1"^^<http://www.w3.org/2001/XMLSchema#string>
2+
<http://example.org/s1> <http://example.org/p1> "1"
33
<http://example.org/s2> <http://example.org/p2> 2.2
44
<http://example.org/s3> <http://example.org/p3> "-3"^^<http://www.w3.org/2001/XMLSchema#negativeInteger>
5-
<http://example.org/s4> <http://example.org/p4> "4,4"^^<http://www.w3.org/2001/XMLSchema#string>
5+
<http://example.org/s4> <http://example.org/p4> "4,4"
66
<http://example.org/s5> <http://example.org/p5> "5,5"^^<http://example.org/myCustomDatatype>
77
<http://example.org/s6> <http://example.org/p6> 1.0e6
88
<http://example.org/s7> <http://example.org/p7> "a7"^^<http://www.w3.org/2001/XMLSchema#hexBinary>

‎sparql11/data-sparql11/functions/concat01.srx

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</head>
66
<results>
77
<result>
8-
<binding name="str"><literal datatype="http://www.w3.org/2001/XMLSchema#string">abcDEF</literal></binding>
8+
<binding name="str"><literal>abcDEF</literal></binding>
99
</result>
1010
</results>
1111
</sparql>

‎sparql11/data-sparql11/functions/concat02.srx

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
<variable name="str"/>
55
</head>
66
<results>
7-
<result><binding name="str"><literal datatype="http://www.w3.org/2001/XMLSchema#string">abcabc</literal></binding></result>
8-
<result><binding name="str"><literal datatype="http://www.w3.org/2001/XMLSchema#string">abcdef</literal></binding></result>
9-
<result><binding name="str"><literal datatype="http://www.w3.org/2001/XMLSchema#string">defabc</literal></binding></result>
10-
<result><binding name="str"><literal datatype="http://www.w3.org/2001/XMLSchema#string">defdef</literal></binding></result>
7+
<result><binding name="str"><literal>abcabc</literal></binding></result>
8+
<result><binding name="str"><literal>abcdef</literal></binding></result>
9+
<result><binding name="str"><literal>defabc</literal></binding></result>
10+
<result><binding name="str"><literal>defdef</literal></binding></result>
1111
<result><binding name="str"><literal xml:lang="en">englishenglish</literal></binding></result>
1212
<result><binding name="str"><literal xml:lang="fr">françaisfrançais</literal></binding></result>
1313
<result><binding name="str"><literal xml:lang="ja">日本語日本語</literal></binding></result>

‎sparql11/data-sparql11/functions/contains01.srx

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</result>
1212
<result>
1313
<binding name="s"><uri>http://example.org/s6</uri></binding>
14-
<binding name="str"><literal datatype="http://www.w3.org/2001/XMLSchema#string">abc</literal></binding>
14+
<binding name="str"><literal>abc</literal></binding>
1515
</result>
1616
</results>
1717
</sparql>

‎sparql11/data-sparql11/functions/encode01.srx

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@
3333
</result>
3434
<result>
3535
<binding name="s"><uri>http://example.org/s6</uri></binding>
36-
<binding name="str"><literal datatype="http://www.w3.org/2001/XMLSchema#string">abc</literal></binding>
36+
<binding name="str"><literal>abc</literal></binding>
3737
<binding name="encoded"><literal>abc</literal></binding>
3838
</result>
3939
<result>
4040
<binding name="s"><uri>http://example.org/s7</uri></binding>
41-
<binding name="str"><literal datatype="http://www.w3.org/2001/XMLSchema#string">DEF</literal></binding>
41+
<binding name="str"><literal>DEF</literal></binding>
4242
<binding name="encoded"><literal>DEF</literal></binding>
4343
</result>
4444
</results>

‎sparql11/data-sparql11/functions/ends01.srx

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<results>
88
<result>
99
<binding name="s"><uri>http://example.org/s6</uri></binding>
10-
<binding name="str"><literal datatype="http://www.w3.org/2001/XMLSchema#string">abc</literal></binding>
10+
<binding name="str"><literal>abc</literal></binding>
1111
</result>
1212
</results>
1313
</sparql>

‎sparql11/data-sparql11/functions/if01.srx

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</result>
1616
<result>
1717
<binding name="o">
18-
<literal datatype="http://www.w3.org/2001/XMLSchema#string">def</literal>
18+
<literal>def</literal>
1919
</binding>
2020
<binding name="integer">
2121
<literal datatype="http://www.w3.org/2001/XMLSchema#boolean">false</literal>
@@ -47,7 +47,7 @@
4747
</result>
4848
<result>
4949
<binding name="o">
50-
<literal datatype="http://www.w3.org/2001/XMLSchema#string">abc</literal>
50+
<literal>abc</literal>
5151
</binding>
5252
<binding name="integer">
5353
<literal datatype="http://www.w3.org/2001/XMLSchema#boolean">false</literal>

‎sparql11/data-sparql11/functions/lcase01.srx

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</result>
1616
<result>
1717
<binding name="s"><uri>http://example.org/s7</uri></binding>
18-
<binding name="lstr"><literal datatype="http://www.w3.org/2001/XMLSchema#string">def</literal></binding>
18+
<binding name="lstr"><literal>def</literal></binding>
1919
</result>
2020
<result>
2121
<binding name="s"><uri>http://example.org/s3</uri></binding>
@@ -27,7 +27,7 @@
2727
</result>
2828
<result>
2929
<binding name="s"><uri>http://example.org/s6</uri></binding>
30-
<binding name="lstr"><literal datatype="http://www.w3.org/2001/XMLSchema#string">abc</literal></binding>
30+
<binding name="lstr"><literal>abc</literal></binding>
3131
</result>
3232
<result>
3333
<binding name="s"><uri>http://example.org/s1</uri></binding>

‎sparql11/data-sparql11/functions/length01.srx

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<binding name="len"><literal datatype="http://www.w3.org/2001/XMLSchema#integer">3</literal></binding>
1515
</result>
1616
<result>
17-
<binding name="str"><literal datatype="http://www.w3.org/2001/XMLSchema#string">DEF</literal></binding>
17+
<binding name="str"><literal>DEF</literal></binding>
1818
<binding name="len"><literal datatype="http://www.w3.org/2001/XMLSchema#integer">3</literal></binding>
1919
</result>
2020
<result>
@@ -26,7 +26,7 @@
2626
<binding name="len"><literal datatype="http://www.w3.org/2001/XMLSchema#integer">4</literal></binding>
2727
</result>
2828
<result>
29-
<binding name="str"><literal datatype="http://www.w3.org/2001/XMLSchema#string">abc</literal></binding>
29+
<binding name="str"><literal>abc</literal></binding>
3030
<binding name="len"><literal datatype="http://www.w3.org/2001/XMLSchema#integer">3</literal></binding>
3131
</result>
3232
<result>

‎sparql11/data-sparql11/functions/plus-1.srx

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@
4343
</result>
4444
<result>
4545
<binding name="x">
46-
<literal datatype="http://www.w3.org/2001/XMLSchema#string">1</literal>
46+
<literal>1</literal>
4747
</binding>
4848
<binding name="y">
4949
<literal>2</literal>
5050
</binding>
5151
</result>
5252
<result>
5353
<binding name="x">
54-
<literal datatype="http://www.w3.org/2001/XMLSchema#string">1</literal>
54+
<literal>1</literal>
5555
</binding>
5656
<binding name="y">
5757
<literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>

‎sparql11/data-sparql11/functions/plus-2.srx

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@
4040
</result>
4141
<result>
4242
<binding name="x">
43-
<literal datatype="http://www.w3.org/2001/XMLSchema#string">1</literal>
43+
<literal>1</literal>
4444
</binding>
4545
<binding name="y">
4646
<literal>2</literal>
4747
</binding>
4848
</result>
4949
<result>
5050
<binding name="x">
51-
<literal datatype="http://www.w3.org/2001/XMLSchema#string">1</literal>
51+
<literal>1</literal>
5252
</binding>
5353
<binding name="y">
5454
<literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>

‎sparql11/data-sparql11/functions/replace01.srx

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
</result>
2424
<result>
2525
<binding name="s"><uri>http://example.org/s5</uri></binding>
26-
<binding name="new"><literal datatype="http://www.w3.org/2001/XMLSchema#string">abc</literal></binding>
26+
<binding name="new"><literal>abc</literal></binding>
2727
</result>
2828
<result>
2929
<binding name="s"><uri>http://example.org/s6</uri></binding>
30-
<binding name="new"><literal datatype="http://www.w3.org/2001/XMLSchema#string">def</literal></binding>
30+
<binding name="new"><literal>def</literal></binding>
3131
</result>
3232
<result>
3333
<binding name="s"><uri>http://example.org/s7</uri></binding>

‎sparql11/data-sparql11/functions/strafter01.srx

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
</result>
2424
<result>
2525
<binding name="s"><uri>http://example.org/s5</uri></binding>
26-
<binding name="suffix"><literal datatype="http://www.w3.org/2001/XMLSchema#string"></literal></binding>
26+
<binding name="suffix"><literal></literal></binding>
2727
</result>
2828
<result>
2929
<binding name="s"><uri>http://example.org/s6</uri></binding>
30-
<binding name="suffix"><literal datatype="http://www.w3.org/2001/XMLSchema#string">f</literal></binding>
30+
<binding name="suffix"><literal>f</literal></binding>
3131
</result>
3232
<result>
3333
<binding name="s"><uri>http://example.org/s7</uri></binding>

‎sparql11/data-sparql11/functions/strafter01a.srx

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</result>
2828
<result>
2929
<binding name="s"><uri>http://example.org/s6</uri></binding>
30-
<binding name="suffix"><literal datatype="http://www.w3.org/2001/XMLSchema#string">f</literal></binding>
30+
<binding name="suffix"><literal>f</literal></binding>
3131
</result>
3232
<result>
3333
<binding name="s"><uri>http://example.org/s7</uri></binding>

‎sparql11/data-sparql11/functions/strafter02.srx

+5-5
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@
3333
</result>
3434
<result>
3535
<binding name="s"><uri>http://example.org/s3</uri></binding>
36-
<binding name="str"><literal datatype="http://www.w3.org/2001/XMLSchema#string">abc</literal></binding>
37-
<binding name="ab"><literal datatype="http://www.w3.org/2001/XMLSchema#string">c</literal></binding>
38-
<binding name="aab"><literal datatype="http://www.w3.org/2001/XMLSchema#string">c</literal></binding>
39-
<binding name="a"><literal datatype="http://www.w3.org/2001/XMLSchema#string">abc</literal></binding>
40-
<binding name="abx"><literal datatype="http://www.w3.org/2001/XMLSchema#string">c</literal></binding>
36+
<binding name="str"><literal>abc</literal></binding>
37+
<binding name="ab"><literal>c</literal></binding>
38+
<binding name="aab"><literal>c</literal></binding>
39+
<binding name="a"><literal>abc</literal></binding>
40+
<binding name="abx"><literal>c</literal></binding>
4141
<binding name="axyzx"><literal></literal></binding>
4242
</result>
4343
</results>

‎sparql11/data-sparql11/functions/strbefore01.srx

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
</result>
2424
<result>
2525
<binding name="s"><uri>http://example.org/s5</uri></binding>
26-
<binding name="prefix"><literal datatype="http://www.w3.org/2001/XMLSchema#string"></literal></binding>
26+
<binding name="prefix"><literal></literal></binding>
2727
</result>
2828
<result>
2929
<binding name="s"><uri>http://example.org/s6</uri></binding>
30-
<binding name="prefix"><literal datatype="http://www.w3.org/2001/XMLSchema#string"></literal></binding>
30+
<binding name="prefix"><literal></literal></binding>
3131
</result>
3232
<result>
3333
<binding name="s"><uri>http://example.org/s7</uri></binding>

‎sparql11/data-sparql11/functions/strbefore02.srx

+5-5
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@
3333
</result>
3434
<result>
3535
<binding name="s"><uri>http://example.org/s3</uri></binding>
36-
<binding name="str"><literal datatype="http://www.w3.org/2001/XMLSchema#string">abc</literal></binding>
37-
<binding name="bb"><literal datatype="http://www.w3.org/2001/XMLSchema#string">a</literal></binding>
38-
<binding name="bbc"><literal datatype="http://www.w3.org/2001/XMLSchema#string">a</literal></binding>
39-
<binding name="b"><literal datatype="http://www.w3.org/2001/XMLSchema#string"></literal></binding>
40-
<binding name="bbx"><literal datatype="http://www.w3.org/2001/XMLSchema#string">a</literal></binding>
36+
<binding name="str"><literal>abc</literal></binding>
37+
<binding name="bb"><literal>a</literal></binding>
38+
<binding name="bbc"><literal>a</literal></binding>
39+
<binding name="b"><literal></literal></binding>
40+
<binding name="bbx"><literal>a</literal></binding>
4141
<binding name="bxyzx"><literal></literal></binding>
4242
</result>
4343
</results>

‎sparql11/data-sparql11/functions/strdt02.srx

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<results>
88
<result>
99
<binding name="s"><uri>http://example.org/s2</uri></binding>
10-
<binding name="str1"><literal datatype="http://www.w3.org/2001/XMLSchema#string">bar</literal></binding>
10+
<binding name="str1"><literal>bar</literal></binding>
1111
</result>
1212
</results>
1313
</sparql>

‎sparql11/data-sparql11/functions/strdt03-rdf11.srx

+5-5
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,24 @@
1313

1414
<result>
1515
<binding name="s"><uri>http://example.org/s1</uri></binding>
16-
<binding name="str1"><literal datatype="http://www.w3.org/2001/XMLSchema#string">foo</literal></binding>
16+
<binding name="str1"><literal>foo</literal></binding>
1717
</result>
1818
<result><binding name="s"><uri>http://example.org/s2</uri></binding></result>
1919
<result>
2020
<binding name="s"><uri>http://example.org/s3</uri></binding>
21-
<binding name="str1"><literal datatype="http://www.w3.org/2001/XMLSchema#string">BAZ</literal></binding>
21+
<binding name="str1"><literal>BAZ</literal></binding>
2222
</result>
2323
<result>
2424
<binding name="s"><uri>http://example.org/s4</uri></binding>
25-
<binding name="str1"><literal datatype="http://www.w3.org/2001/XMLSchema#string">食べ物</literal></binding>
25+
<binding name="str1"><literal>食べ物</literal></binding>
2626
</result>
2727
<result>
2828
<binding name="s"><uri>http://example.org/s5</uri></binding>
29-
<binding name="str1"><literal datatype="http://www.w3.org/2001/XMLSchema#string">100%</literal></binding>
29+
<binding name="str1"><literal>100%</literal></binding>
3030
</result>
3131
<result>
3232
<binding name="s"><uri>http://example.org/s6</uri></binding>
33-
<binding name="str1"><literal datatype="http://www.w3.org/2001/XMLSchema#string">abc</literal></binding>
33+
<binding name="str1"><literal>abc</literal></binding>
3434
</result>
3535
<result>
3636
<binding name="s"><uri>http://example.org/s7</uri></binding>

‎sparql11/data-sparql11/functions/strdt03.srx

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,20 @@
1313

1414
<result>
1515
<binding name="s"><uri>http://example.org/s1</uri></binding>
16-
<binding name="str1"><literal datatype="http://www.w3.org/2001/XMLSchema#string">foo</literal></binding>
16+
<binding name="str1"><literal>foo</literal></binding>
1717
</result>
1818
<result><binding name="s"><uri>http://example.org/s2</uri></binding></result>
1919
<result>
2020
<binding name="s"><uri>http://example.org/s3</uri></binding>
21-
<binding name="str1"><literal datatype="http://www.w3.org/2001/XMLSchema#string">BAZ</literal></binding>
21+
<binding name="str1"><literal>BAZ</literal></binding>
2222
</result>
2323
<result>
2424
<binding name="s"><uri>http://example.org/s4</uri></binding>
25-
<binding name="str1"><literal datatype="http://www.w3.org/2001/XMLSchema#string">食べ物</literal></binding>
25+
<binding name="str1"><literal>食べ物</literal></binding>
2626
</result>
2727
<result>
2828
<binding name="s"><uri>http://example.org/s5</uri></binding>
29-
<binding name="str1"><literal datatype="http://www.w3.org/2001/XMLSchema#string">100%</literal></binding>
29+
<binding name="str1"><literal>100%</literal></binding>
3030
</result>
3131
<result><binding name="s"><uri>http://example.org/s6</uri></binding></result>
3232
<result><binding name="s"><uri>http://example.org/s7</uri></binding></result>

‎sparql11/data-sparql11/functions/substring01.srx

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</result>
1919
<result>
2020
<binding name="s"><uri>http://example.org/s7</uri></binding>
21-
<binding name="str"><literal datatype="http://www.w3.org/2001/XMLSchema#string">DEF</literal></binding>
22-
<binding name="substr"><literal datatype="http://www.w3.org/2001/XMLSchema#string">D</literal></binding>
21+
<binding name="str"><literal>DEF</literal></binding>
22+
<binding name="substr"><literal>D</literal></binding>
2323
</result>
2424
<result>
2525
<binding name="s"><uri>http://example.org/s3</uri></binding>
@@ -33,8 +33,8 @@
3333
</result>
3434
<result>
3535
<binding name="s"><uri>http://example.org/s6</uri></binding>
36-
<binding name="str"><literal datatype="http://www.w3.org/2001/XMLSchema#string">abc</literal></binding>
37-
<binding name="substr"><literal datatype="http://www.w3.org/2001/XMLSchema#string">a</literal></binding>
36+
<binding name="str"><literal>abc</literal></binding>
37+
<binding name="substr"><literal>a</literal></binding>
3838
</result>
3939
<result>
4040
<binding name="s"><uri>http://example.org/s1</uri></binding>

‎sparql11/data-sparql11/functions/substring02.srx

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</result>
1919
<result>
2020
<binding name="s"><uri>http://example.org/s7</uri></binding>
21-
<binding name="str"><literal datatype="http://www.w3.org/2001/XMLSchema#string">DEF</literal></binding>
22-
<binding name="substr"><literal datatype="http://www.w3.org/2001/XMLSchema#string">EF</literal></binding>
21+
<binding name="str"><literal>DEF</literal></binding>
22+
<binding name="substr"><literal>EF</literal></binding>
2323
</result>
2424
<result>
2525
<binding name="s"><uri>http://example.org/s3</uri></binding>
@@ -33,8 +33,8 @@
3333
</result>
3434
<result>
3535
<binding name="s"><uri>http://example.org/s6</uri></binding>
36-
<binding name="str"><literal datatype="http://www.w3.org/2001/XMLSchema#string">abc</literal></binding>
37-
<binding name="substr"><literal datatype="http://www.w3.org/2001/XMLSchema#string">bc</literal></binding>
36+
<binding name="str"><literal>abc</literal></binding>
37+
<binding name="substr"><literal>bc</literal></binding>
3838
</result>
3939
<result>
4040
<binding name="s"><uri>http://example.org/s1</uri></binding>

‎sparql11/data-sparql11/functions/ucase01.srx

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</result>
1616
<result>
1717
<binding name="s"><uri>http://example.org/s7</uri></binding>
18-
<binding name="ustr"><literal datatype="http://www.w3.org/2001/XMLSchema#string">DEF</literal></binding>
18+
<binding name="ustr"><literal>DEF</literal></binding>
1919
</result>
2020
<result>
2121
<binding name="s"><uri>http://example.org/s3</uri></binding>
@@ -27,7 +27,7 @@
2727
</result>
2828
<result>
2929
<binding name="s"><uri>http://example.org/s6</uri></binding>
30-
<binding name="ustr"><literal datatype="http://www.w3.org/2001/XMLSchema#string">ABC</literal></binding>
30+
<binding name="ustr"><literal>ABC</literal></binding>
3131
</result>
3232
<result>
3333
<binding name="s"><uri>http://example.org/s1</uri></binding>

0 commit comments

Comments
 (0)