diff --git a/src/database/hierarchies.rs b/src/database/hierarchies.rs index 680e5e5..d091edf 100644 --- a/src/database/hierarchies.rs +++ b/src/database/hierarchies.rs @@ -269,8 +269,8 @@ pub fn resolve_path_cached( pub fn initialize_hier(connection: &UpEndConnection) -> Result<()> { connection.insert_entry(Entry::try_from(&*HIER_INVARIANT)?)?; - upend_insert_addr!(connection, HIER_ADDR, IS_OF_TYPE_ATTR, TYPE_ADDR); - upend_insert_val!(connection, HIER_ADDR, TYPE_HAS_ATTR, HIER_HAS_ATTR); + upend_insert_addr!(connection, HIER_ADDR, IS_OF_TYPE_ATTR, TYPE_ADDR)?; + upend_insert_val!(connection, HIER_ADDR, TYPE_HAS_ATTR, HIER_HAS_ATTR)?; Ok(()) } diff --git a/src/database/macros.rs b/src/database/macros.rs index e49cc3f..fc05617 100644 --- a/src/database/macros.rs +++ b/src/database/macros.rs @@ -6,7 +6,7 @@ macro_rules! upend_insert_val { attribute: String::from($attribute), value: crate::database::entry::EntryValue::Value(serde_json::Value::from($value)), }, - )?; + ) }}; } @@ -18,6 +18,6 @@ macro_rules! upend_insert_addr { attribute: String::from($attribute), value: crate::database::entry::EntryValue::Address($addr.clone()), }, - )?; + ) }}; } diff --git a/src/database/mod.rs b/src/database/mod.rs index 595551c..13c4748 100644 --- a/src/database/mod.rs +++ b/src/database/mod.rs @@ -140,8 +140,8 @@ impl UpEndDatabase { trace!("Initializing types..."); connection.insert_entry(Entry::try_from(&*TYPE_INVARIANT)?)?; - upend_insert_addr!(connection, TYPE_ADDR, IS_OF_TYPE_ATTR, TYPE_ADDR); - upend_insert_val!(connection, TYPE_ADDR, TYPE_HAS_ATTR, TYPE_HAS_ATTR); + upend_insert_addr!(connection, TYPE_ADDR, IS_OF_TYPE_ATTR, TYPE_ADDR)?; + upend_insert_val!(connection, TYPE_ADDR, TYPE_HAS_ATTR, TYPE_HAS_ATTR)?; initialize_hier(&connection)?; diff --git a/src/filesystem.rs b/src/filesystem.rs index 089f56c..717de1c 100644 --- a/src/filesystem.rs +++ b/src/filesystem.rs @@ -40,10 +40,10 @@ lazy_static! { fn initialize_types(connection: &UpEndConnection) -> Result<()> { // BLOB_TYPE connection.insert_entry(Entry::try_from(&*BLOB_TYPE_INVARIANT)?)?; - upend_insert_addr!(connection, BLOB_TYPE_ADDR, IS_OF_TYPE_ATTR, TYPE_ADDR); - upend_insert_val!(connection, BLOB_TYPE_ADDR, TYPE_HAS_ATTR, FILE_MTIME_KEY); - upend_insert_val!(connection, BLOB_TYPE_ADDR, TYPE_HAS_ATTR, FILE_SIZE_KEY); - upend_insert_val!(connection, BLOB_TYPE_ADDR, TYPE_HAS_ATTR, FILE_MIME_KEY); + upend_insert_addr!(connection, BLOB_TYPE_ADDR, IS_OF_TYPE_ATTR, TYPE_ADDR)?; + upend_insert_val!(connection, BLOB_TYPE_ADDR, TYPE_HAS_ATTR, FILE_MTIME_KEY)?; + upend_insert_val!(connection, BLOB_TYPE_ADDR, TYPE_HAS_ATTR, FILE_SIZE_KEY)?; + upend_insert_val!(connection, BLOB_TYPE_ADDR, TYPE_HAS_ATTR, FILE_MIME_KEY)?; Ok(()) }