Skip to content

fixes issue #104 #105

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.

Sign up for GitHub

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

Open
elsdvlee wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fixes issue #104 #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

### Added

- Respec template
- Respec template
- rml:outerJoin
18 changes: 18 additions & 0 deletions ontology/documentation/ontology.jsonld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,24 @@
"http://www.w3.org/2000/01/rdf-schema#range" : [ {
"@id" : "http://w3id.org/rml/LogicalViewJoin"
} ]
}, {
"@id" : "http://w3id.org/rml/outerJoin",
"@type" : [ "http://www.w3.org/2002/07/owl#ObjectProperty" ],
"http://www.w3.org/2000/01/rdf-schema#comment" : [ {
"@value" : "An outer join of the logical view."
} ],
"http://www.w3.org/2000/01/rdf-schema#domain" : [ {
"@id" : "http://w3id.org/rml/LogicalView"
} ],
"http://www.w3.org/2000/01/rdf-schema#isDefinedBy" : [ {
"@id" : "http://w3id.org/rml/lv/"
} ],
"http://www.w3.org/2000/01/rdf-schema#label" : [ {
"@value" : "outer join"
} ],
"http://www.w3.org/2000/01/rdf-schema#range" : [ {
"@id" : "http://w3id.org/rml/LogicalViewJoin"
} ]
}, {
"@id" : "http://w3id.org/rml/lv/",
"@type" : [ "http://www.w3.org/2002/07/owl#Ontology" ],
Expand Down
8 changes: 8 additions & 0 deletions ontology/documentation/ontology.nt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,14 @@ _:genid1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/20
<http://w3id.org/rml/leftJoin> <http://www.w3.org/2000/01/rdf-schema#isDefinedBy> <http://w3id.org/rml/lv/> .
<http://w3id.org/rml/leftJoin> <http://www.w3.org/2000/01/rdf-schema#label> "left join" .
#
# http://w3id.org/rml/outerJoin
<http://w3id.org/rml/outerJoin> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> .
<http://w3id.org/rml/outerJoin> <http://www.w3.org/2000/01/rdf-schema#domain> <http://w3id.org/rml/LogicalView> .
<http://w3id.org/rml/outerJoin> <http://www.w3.org/2000/01/rdf-schema#range> <http://w3id.org/rml/LogicalViewJoin> .
<http://w3id.org/rml/outerJoin> <http://www.w3.org/2000/01/rdf-schema#comment> "An outer join of the logical view." .
<http://w3id.org/rml/outerJoin> <http://www.w3.org/2000/01/rdf-schema#isDefinedBy> <http://w3id.org/rml/lv/> .
<http://w3id.org/rml/outerJoin> <http://www.w3.org/2000/01/rdf-schema#label> "outer join" .
#
# http://w3id.org/rml/onFields
<http://w3id.org/rml/onFields> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> .
<http://w3id.org/rml/onFields> <http://www.w3.org/2000/01/rdf-schema#domain> <http://w3id.org/rml/StructuralAnnotation> .
Expand Down
13 changes: 13 additions & 0 deletions ontology/documentation/ontology.owl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,19 @@



<!-- http://w3id.org/rml/outerJoin -->


<owl:ObjectProperty rdf:about="http://w3id.org/rml/outerJoin">
<rdfs:domain rdf:resource="http://w3id.org/rml/LogicalView"/>
<rdfs:range rdf:resource="http://w3id.org/rml/LogicalViewJoin"/>
<rdfs:comment>An outer join of the logical view.</rdfs:comment>
<rdfs:isDefinedBy rdf:resource="http://w3id.org/rml/lv/"/>
<rdfs:label>outer join</rdfs:label>
</owl:ObjectProperty>



<!-- http://w3id.org/rml/onFields -->


Expand Down
9 changes: 9 additions & 0 deletions ontology/documentation/ontology.ttl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,15 @@
rdfs:label "left join" .


### http://w3id.org/rml/outerJoin
<http://w3id.org/rml/outerJoin> rdf:type owl:ObjectProperty ;
rdfs:domain <http://w3id.org/rml/LogicalView> ;
rdfs:range <http://w3id.org/rml/LogicalViewJoin> ;
rdfs:comment "An outer join of the logical view." ;
rdfs:isDefinedBy <http://w3id.org/rml/lv/> ;
rdfs:label "outer join" .


### http://w3id.org/rml/onFields
<http://w3id.org/rml/onFields> rdf:type owl:ObjectProperty ;
rdfs:domain <http://w3id.org/rml/StructuralAnnotation> ;
Expand Down
9 changes: 9 additions & 0 deletions ontology/rml-lv.owl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,15 @@ rml:leftJoin rdf:type owl:ObjectProperty ;
rdfs:isDefinedBy <http://w3id.org/rml/lv/> .


### http://w3id.org/rml/outerJoin
rml:outerJoin rdf:type owl:ObjectProperty ;
rdfs:label "outer join" ;
rdfs:comment "An outer join of the logical view." ;
rdfs:domain rml:LogicalView ;
rdfs:range rml:LogicalViewJoin ;
rdfs:isDefinedBy <http://w3id.org/rml/lv/> .


### http://w3id.org/rml/parentLogicalView
rml:parentLogicalView rdf:type owl:ObjectProperty ;
rdfs:label "parent logical view" ;
Expand Down
Binary file modified ontology/rml-lv_diagram.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 4 additions & 1 deletion ontology/rml-lv_diagram.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 12 additions & 3 deletions shapes/lv.ttl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,15 @@ rmlsh:LogicalViewShape a sh:NodeShape ;
""" ;
sh:path rml:leftJoin ;
sh:nodeKind sh:BlankNodeOrIRI ;
] , [
sh:description """
An outer join of the logical view.
""" ;
sh:message """
The value of a rml:outerJoin property for a rml:LogicalView must be a resource.
""" ;
sh:path rml:outerJoin ;
sh:nodeKind sh:BlankNodeOrIRI ;
] , [
sh:description """
An inner join of the logical view.
Expand Down Expand Up @@ -213,7 +222,7 @@ rmlsh:LogicalViewJoinShape a sh:NodeShape ;
Furthermore, rml:Field requires what an rml:ExpressionMap requires.
""" ;
sh:targetClass rml:LogicalViewJoin ;
sh:targetObjectsOf rml:leftJoin , rml:innerJoin ;
sh:targetObjectsOf rml:leftJoin , rml:outerJoin , rml:innerJoin ;
sh:property [
sh:description """
The parent logical view of the logical view join.
Expand Down Expand Up @@ -349,13 +358,13 @@ rmlsh:joinCyclesShape a sh:NodeShape ;
sh:targetSubjectsOf rml:viewOn ;
sh:sparql [
a sh:SPARQLConstraint ;
sh:message "There must be no cycles via rml:viewOn and rml:leftJoin or rml:innerJoin." ;
sh:message "There must be no cycles via rml:viewOn and rml:leftJoin, rml:outerJoin, or rml:innerJoin." ;
sh:select """
PREFIX rml: <http://w3id.org/rml/>
SELECT ?this
WHERE {
?this a rml:LogicalView .
?this ((rml:leftJoin|rml:innerJoin)/rml:parentLogicalView)+ ?this .
?this ((rml:leftJoin|rml:outerJoin|rml:innerJoin)/rml:parentLogicalView)+ ?this .
}
""" ;
] .
1 change: 1 addition & 0 deletions spec/dev.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,5 +120,6 @@

<section data-include="section/annotations.md" data-include-format="markdown"></section>


</body>
</html>
Loading
Loading