Use add2 schema

Author: aothms

sparql.py

@@ -59,9 +59,12 @@ def withschema(fn):
 
     def _(*args, **kwargs):
         schema_name = STANDARD_PREFIXES["ifcowl"].split("/")[-1][:-2]
-        if "_" in schema_name:
-            schema_name = schema_name.split("_")[0]
-        S = ifcopenshell.ifcopenshell_wrapper.schema_by_name(schema_name)
+        try:
+            S = ifcopenshell.ifcopenshell_wrapper.schema_by_name(schema_name)
+        except RuntimeError:
+            if "_" not in schema_name:
+                raise
+            S = ifcopenshell.ifcopenshell_wrapper.schema_by_name(schema_name.split("_")[0])
         return fn(S, *args, **kwargs)
 
     return _

tests/test_specialized_references.py

@@ -247,7 +247,7 @@ def test_references_chained_entities_and_direct_attribute_entities_are_equivalen
     comparing actual extracted bindings and SPARQL rows, not only match flags.
     """
     monkeypatch.setitem(
-        sparql.STANDARD_PREFIXES, "ifcowl", "<http://example.org/IFC4X3#>"
+        sparql.STANDARD_PREFIXES, "ifcowl", "<http://example.org/IFC4X3_ADD2#>"
     )
     extraction = {}
     query_results = {}
@@ -363,7 +363,7 @@ def test_graphviz_reference_matches_xml_specialization(
 
 def owl_graph(model):
     graph = Graph()
-    owl = Namespace("http://example.org/IFC4X3#")
+    owl = Namespace("http://example.org/IFC4X3_ADD2#")
     inst = Namespace("http://example.org/instances/")
     express = Namespace("https://w3id.org/express#")
     schema = ifcopenshell.schema_by_name("IFC4X3_ADD2")
@@ -399,7 +399,7 @@ def test_sparql_executes_specialized_type_filter(
     tmp_path, geometry_models, monkeypatch, revolved, leaf
 ):
     monkeypatch.setitem(
-        sparql.STANDARD_PREFIXES, "ifcowl", "<http://example.org/IFC4X3#>"
+        sparql.STANDARD_PREFIXES, "ifcowl", "<http://example.org/IFC4X3_ADD2#>"
     )
     parsed = body_template(tmp_path, revolved=revolved, leaf=leaf)
     query = sparql.convertor.template(parsed)