Fix slight bug in dealing with nested optionals

DataTreehouse · Jan 24, 2024 · 8dba22d · 8dba22d
1 parent 81432d1
commit 8dba22d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/maplib/src/mapping.rs b/maplib/src/mapping.rs
@@ -617,7 +617,9 @@ fn create_remapped(
                         .iter()
                         .find(|x| x.stottr_variable.name == v.name)
                     {
-                        if calling_formal_arg.optional {
+                        if target.optional {
+                            continue;
+                        } else if calling_formal_arg.optional {
                             return Ok(None);
                         }
                     }

diff --git a/py_maplib/src/lib.rs b/py_maplib/src/lib.rs
@@ -379,7 +379,7 @@ fn _maplib(_py: Python<'_>, m: &PyModule) -> PyResult<()> {
     Ok(())
 }
 
-fn fix_multicolumns(mut df: DataFrame, dts: &HashMap<String, RDFNodeType>) -> DataFrame {
+fn fix_multicolumns(df: DataFrame, dts: &HashMap<String, RDFNodeType>) -> DataFrame {
     let mut lf = df.lazy();
     for (c, v) in dts {
         if v == &RDFNodeType::MultiType {