From 470f51ac7fa6dad3aa460bffec92d361ab12009e Mon Sep 17 00:00:00 2001
From: Jacobus Geluk <jacobus.geluk@agnos.ai>
Date: Sun, 27 Aug 2023 15:55:38 +0100
Subject: [PATCH] feat(rdfox-6-3a): Support for RDFox 6.3a and minor fixes

---
 Cargo.toml                   | 8 ++++----
 build.rs                     | 6 +++---
 src/cursor/cursor_row.rs     | 8 ++++----
 src/data_store_connection.rs | 2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index b1c7c31e..c16105ef 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -37,7 +37,7 @@ colored = "2.0.0"
 ignore = "0.4.18"
 iref = "2.1.3"
 indoc = "2.0.0"
-num_enum = "0.6.1"
+num_enum = "0.7.0"
 nom = { version = "7.1.1", optional = true }
 phf = { version = "0.11", features = ["macros"] }
 r2d2 = "0.8.1"
@@ -60,13 +60,13 @@ tracing-subscriber = { version = "0.3.16", features = ["env-filter", "fmt", "ans
 curl = "0.4.43"
 lazy_static = "1.4.0"
 zip = "0.6.2"
-bindgen = "0.65.1"
+bindgen = "0.66.1"
 
 [package.metadata.docs.rs]
 rustc-args = ["--cfg", "docsrs"]
 
 [features]
-default = ["nom", "rdfox-6-3"]
+default = ["nom", "rdfox-6-3a"]
 rdftk-support = ["rdftk_iri/uuid_iri"]
 nom-support = ["nom"]
 #
@@ -77,6 +77,6 @@ rdfox-dylib = []
 # Select a version
 #
 rdfox-6-2 = []
-rdfox-6-3 = []
+rdfox-6-3a = []
 
 
diff --git a/build.rs b/build.rs
index 779bdfd3..fd9732a4 100644
--- a/build.rs
+++ b/build.rs
@@ -131,12 +131,12 @@ lazy_static! {
     static ref RDFOX_VERSION_EXPECTED: &'static str =
         option_env!("RDFOX_VERSION_EXPECTED").unwrap_or("6.2");
 }
-#[cfg(feature = "rdfox-6-3")]
+#[cfg(feature = "rdfox-6-3a")]
 lazy_static! {
     static ref RDFOX_VERSION_EXPECTED: &'static str =
-        option_env!("RDFOX_VERSION_EXPECTED").unwrap_or("6.3");
+        option_env!("RDFOX_VERSION_EXPECTED").unwrap_or("6.3a");
 }
-#[cfg(not(any(feature = "rdfox-6-2", feature = "rdfox-6-3")))]
+#[cfg(not(any(feature = "rdfox-6-2", feature = "rdfox-6-3a")))]
 compile_error!("You have to at least specify one of the rdfox-X-Y version number features");
 
 fn rdfox_download_url() -> String {
diff --git a/src/cursor/cursor_row.rs b/src/cursor/cursor_row.rs
index 568dacf4..ea0d6113 100644
--- a/src/cursor/cursor_row.rs
+++ b/src/cursor/cursor_row.rs
@@ -47,10 +47,10 @@ impl<'a> CursorRow<'a> {
         let mut lexical_form_size = 0_usize;
         let mut datatype_id: u8 = DataType::UnboundValue as u8;
         let mut resource_resolved = false;
-        tracing::trace!(
-            target: LOG_TARGET_DATABASE,
-            "CCursor_appendResourceLexicalForm({term_index}):"
-        );
+        // tracing::trace!(
+        //     target: LOG_TARGET_DATABASE,
+        //     "CCursor_appendResourceLexicalForm({term_index}):"
+        // );
 
         // CCursor_appendResourceLexicalForm(cursor, termIndex, lexicalFormBuffer,
         // sizeof(lexicalFormBuffer), &lexicalFormSize, &datatypeID, &resourceResolved);
diff --git a/src/data_store_connection.rs b/src/data_store_connection.rs
index 821f1785..6f6f856d 100644
--- a/src/data_store_connection.rs
+++ b/src/data_store_connection.rs
@@ -351,7 +351,7 @@ impl DataStoreConnection {
                 base_iri
                     .as_ref()
                     .map(|iri| iri.as_str())
-                    .unwrap_or_else(|| DEFAULT_BASE_IRI.deref()),
+                    .unwrap_or_else(|| DEFAULT_BASE_IRI),
             ),
         )
     }