checkpoint

aucampia · aucampia · commit 42913b57f3c8 · 2023-07-05T22:27:45.000Z
diff --git a/rdflib/__init__.py b/rdflib/__init__.py
@@ -118,6 +118,9 @@
 
 del sys
 
+#: Checking if this works ...
+CHECKME_A = 1
+
 
 NORMALIZE_LITERALS = True
 """
diff --git a/rdflib/util.py b/rdflib/util.py
@@ -620,8 +620,8 @@ def _iri2uri(iri: str) -> str:
 
 def _has_non_default_graphs(graph: rdflib.graph.ConjunctiveGraph) -> bool:
     """
-    Check if the value passed as `graph` contains graphs other than the default
-    graph.
+    Check if the container passed as `graph` contains graphs other than the
+    default graph.
 
     The intent of this is to detect if the value passed can be serialized using
     formats which do not support named graphs like N-Triples and Turtle.
@@ -636,9 +636,9 @@ def _has_non_default_graphs(graph: rdflib.graph.ConjunctiveGraph) -> bool:
     least one graph other than the default graph it will return `True`.
     """
     default_context = graph.default_context
-    logging.debug("default_context.identifier = %s", default_context.identifier)
+    # logging.debug("default_context.identifier = %s", default_context.identifier)
     for context_index, context in enumerate(graph.contexts()):
-        logging.debug("contexts[%s].identifier = %s", context_index, context.identifier)
+        # logging.debug("contexts[%s].identifier = %s", context_index, context.identifier)
         if context.identifier != default_context.identifier:
             return True
         if context_index > 0:
diff --git a/test/data/variants/blank_and_base_prefix-asserts.json b/test/data/variants/blank_and_base_prefix-asserts.json
@@ -1,4 +1,3 @@
 {
-  "quad_count": 6,
-  "exact_match": true
+  "quad_count": 6
 }
diff --git a/test/data/variants/blank_and_base_prefix-meta.json b/test/data/variants/blank_and_base_prefix-meta.json
@@ -0,0 +1,3 @@
+{
+  "exact_match": true
+}
diff --git a/test/data/variants/diverse_quads-asserts.json b/test/data/variants/diverse_quads-asserts.json
@@ -1,4 +1,3 @@
 {
-  "quad_count": 10,
-  "exact_match": true
+  "quad_count": 10
 }
diff --git a/test/data/variants/diverse_quads-meta.json b/test/data/variants/diverse_quads-meta.json
@@ -0,0 +1,3 @@
+{
+  "exact_match": true
+}
diff --git a/test/data/variants/diverse_triples-asserts.json b/test/data/variants/diverse_triples-asserts.json
@@ -1,4 +1,3 @@
 {
-  "quad_count": 5,
-  "exact_match": true
+  "quad_count": 5
 }
diff --git a/test/data/variants/diverse_triples-meta.json b/test/data/variants/diverse_triples-meta.json
@@ -0,0 +1,3 @@
+{
+  "exact_match": true
+}
diff --git a/test/data/variants/forward_slash-asserts.json b/test/data/variants/forward_slash-asserts.json
@@ -1,6 +1,5 @@
 {
   "quad_count": 4,
-  "exact_match": true,
   "has_subject_iris": [
     "http://example.org/kb/individual-a",
     "http://example.org/kb/individual-b",
diff --git a/test/data/variants/forward_slash-meta.json b/test/data/variants/forward_slash-meta.json
@@ -0,0 +1,3 @@
+{
+  "exact_match": true
+}
diff --git a/test/data/variants/more_quads-asserts.json b/test/data/variants/more_quads-asserts.json
@@ -1,4 +1,3 @@
 {
-  "quad_count": 8,
-  "exact_match": true
+  "quad_count": 8
 }
diff --git a/test/data/variants/more_quads-meta.json b/test/data/variants/more_quads-meta.json
@@ -0,0 +1,3 @@
+{
+  "exact_match": true
+}
diff --git a/test/data/variants/schema_only_base-asserts.json b/test/data/variants/schema_only_base-asserts.json
@@ -1,4 +1,3 @@
 {
-  "quad_count": 4,
-  "exact_match": true
+  "quad_count": 4
 }
diff --git a/test/data/variants/schema_only_base-meta.json b/test/data/variants/schema_only_base-meta.json
@@ -0,0 +1,3 @@
+{
+  "exact_match": true
+}
diff --git a/test/data/variants/simple_quad-asserts.json b/test/data/variants/simple_quad-asserts.json
@@ -1,4 +1,3 @@
 {
-  "quad_count": 1,
-  "exact_match": true
+  "quad_count": 1
 }
diff --git a/test/data/variants/simple_quad-meta.json b/test/data/variants/simple_quad-meta.json
@@ -0,0 +1,3 @@
+{
+  "exact_match": true
+}
diff --git a/test/data/variants/simple_triple-asserts.json b/test/data/variants/simple_triple-asserts.json
@@ -1,4 +1,3 @@
 {
-  "quad_count": 1,
-  "exact_match": true
+  "quad_count": 1
 }
diff --git a/test/data/variants/simple_triple-meta.json b/test/data/variants/simple_triple-meta.json
@@ -0,0 +1,3 @@
+{
+  "exact_match": true
+}
diff --git a/test/data/variants/special_chars-asserts.json b/test/data/variants/special_chars-asserts.json
@@ -1,4 +1,3 @@
 {
-  "quad_count": 7,
-  "exact_match": true
+  "quad_count": 7
 }
diff --git a/test/data/variants/special_chars-meta.json b/test/data/variants/special_chars-meta.json
@@ -0,0 +1,3 @@
+{
+  "exact_match": true
+}
diff --git a/test/data/variants/xml_literal-asserts.json b/test/data/variants/xml_literal-asserts.json
@@ -1,4 +1,3 @@
 {
-  "quad_count": 1,
-  "exact_match": true
+  "quad_count": 1
 }
diff --git a/test/data/variants/xml_literal-meta.json b/test/data/variants/xml_literal-meta.json
@@ -0,0 +1,3 @@
+{
+  "exact_match": true
+}
diff --git a/test/test_dataset/test_dataset.py b/test/test_dataset/test_dataset.py
@@ -1,7 +1,10 @@
 # -*- coding: utf-8 -*-
+import logging
 import os
 import shutil
 import tempfile
+from typing import Optional
+from rdflib.term import Identifier, Literal
 from test.data import context1, likes, pizza, tarek
 
 import pytest
@@ -10,6 +13,8 @@
 from rdflib.graph import DATASET_DEFAULT_GRAPH_ID, Dataset, Graph
 from rdflib.namespace import Namespace
 from rdflib.store import Store
+from test.utils.namespace import EGDC, EGSCHEME, EGURN
+from rdflib.namespace import XSD
 
 # Will also run SPARQLUpdateStore tests against local SPARQL1.1 endpoint if
 # available. This assumes SPARQL1.1 query/update endpoints running locally at
@@ -265,3 +270,47 @@ def test_subgraph_without_identifier() -> None:
     ) == ("genid", genid_prefix)
 
     assert f"{subgraph.identifier}".startswith(genid_prefix)
+
+
+def test_updating_datatype() -> None:
+    dataset = Dataset()
+
+    dataset.add((EGSCHEME.subject, EGSCHEME.predicate, EGSCHEME.object))
+
+    egurn_graph = dataset.get_context(EGURN.graph)
+    egurn_graph.add(
+        (EGSCHEME.subject, EGDC.predicate, Literal("XSD string", datatype=XSD.string))
+    )
+
+    def find_literal_obj_ctx_id(dataset: Dataset, literal_value: str) -> Optional[Identifier]:
+        for quad in (quad for quad in dataset.quads((None, None, None, None))):
+            if isinstance(quad[2], Literal) and quad[2].value == literal_value:
+                logging.debug("quad = %s", quad)
+                return quad[3]
+        return None
+
+    assert find_literal_obj_ctx_id(dataset, "XSD string") == EGURN.graph
+
+    for context in dataset.contexts():
+        logging.debug("context.identifier = %s", context.identifier)
+        for triple in context:
+            logging.debug("triple = %s", triple)
+            object = triple[2]
+            if not isinstance(object, Literal):
+                continue
+            if object.datatype is None:
+                continue
+            logging.debug("object.datatype = %s", object.datatype)
+            if object.datatype == XSD.string:
+                object._datatype = None
+
+    assert find_literal_obj_ctx_id(dataset, "XSD string") == EGURN.graph
+
+
+    # found = False
+    # for quad in (quad for quad in dataset.quads((None, None, None, None))):
+    #     if isinstance(quad[2], Literal) and quad[2].value == "XSD string":
+    #         logging.debug("quad = %s", quad)
+    #         # found = True
+    #         # break
+    # # assert found is True
diff --git a/test/test_graph/test_variants.py b/test/test_graph/test_variants.py
diff --git a/test/test_util.py b/test/test_util.py
diff --git a/test/utils/__init__.py b/test/utils/__init__.py
diff --git a/test/utils/graph.py b/test/utils/graph.py

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`	`1`	`{`
`2`		`- "quad_count": 6,`
`3`		`- "exact_match": true`
	`2`	`+ "quad_count": 6`
`4`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`	`1`	`{`
`2`		`- "quad_count": 10,`
`3`		`- "exact_match": true`
	`2`	`+ "quad_count": 10`
`4`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`	`1`	`{`
`2`		`- "quad_count": 5,`
`3`		`- "exact_match": true`
	`2`	`+ "quad_count": 5`
`4`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"quad_count": 4,`
`3`		`- "exact_match": true,`
`4`	`3`	`"has_subject_iris": [`
`5`	`4`	`"http://example.org/kb/individual-a",`
`6`	`5`	`"http://example.org/kb/individual-b",`