Fix crash when initial selection contains mix of string and bool (#274)

* Convert string to booleans in vl_selection_test * Add test for selection on mixed string and bool
vega · Mar 23, 2023 · 6b0e04c · 6b0e04c
1 parent 77e06b2
commit 6b0e04c
Show file tree

Hide file tree

Showing 2 changed files with 79 additions and 0 deletions.
diff --git a/vegafusion-runtime/src/expression/compiler/builtin_functions/data/vl_selection_test.rs b/vegafusion-runtime/src/expression/compiler/builtin_functions/data/vl_selection_test.rs
@@ -279,6 +279,14 @@ impl FieldSpec {
                 };
                 cast_to(ms_expr, field_type, schema)
             }
+            ScalarValue::Utf8(Some(s)) if field_type == &DataType::Boolean => {
+                // If comparing string to boolean, treat "false" and "" as false,
+                // all others as true
+                Ok(match s.as_str() {
+                    "false" | "" => lit(false),
+                    _ => lit(true),
+                })
+            }
             _ => {
                 if is_numeric_datatype(field_type) && !is_numeric_datatype(&scalar.get_datatype()) {
                     cast_to(lit(scalar), field_type, schema)

diff --git a/vegafusion-runtime/tests/test_selection.rs b/vegafusion-runtime/tests/test_selection.rs
@@ -216,3 +216,74 @@ mod test_vl_selection_test_e_multi {
     #[test]
     fn test_marker() {} // Help IDE detect test module
 }
+
+mod test_vl_selection_test_e_mixed_str_bool {
+    use crate::util::check::eval_vegafusion_transforms;
+    use crate::*;
+
+    #[test]
+    fn test() {
+        let brush_json = json!([
+            {
+              "unit": "",
+              "fields": [
+                {"field": "Major Genre", "channel": "x", "type": "E"},
+                {"field": "is_pg", "channel": "color", "type": "E"}
+              ],
+              "values": ["Adventure", true]
+            },
+            {
+              "unit": "",
+              "fields": [
+                {"field": "Major Genre", "channel": "x", "type": "E"},
+                {"field": "is_pg", "channel": "color", "type": "E"}
+              ],
+              "values": ["Comedy", false]
+            }
+        ]);
+        let brush = VegaFusionTable::from_json(&brush_json, 16).unwrap();
+
+        let dataset_json = json!([
+            {"Major Genre": "Adventure", "is_pg": true, "Title": "A"},
+            {"Major Genre": "Comedy", "is_pg": true, "Title": "B"},
+            {"Major Genre": "Documentary", "is_pg": true, "Title": "C"},
+            {"Major Genre": "Comedy", "is_pg": false, "Title": "D"},
+            {"Major Genre": "Adventure", "is_pg": true, "Title": "E"},
+        ]);
+        let dataset = VegaFusionTable::from_json(&dataset_json, 16).unwrap();
+
+        let formula_spec = FormulaTransformSpec {
+            expr: format!("vlSelectionTest('brush', datum, 'union')"),
+            as_: "it_is_selected".to_string(),
+            extra: Default::default(),
+        };
+
+        let transform_specs = vec![TransformSpec::Formula(formula_spec)];
+
+        let config = CompilationConfig {
+            data_scope: vec![("brush".to_string(), brush)].into_iter().collect(),
+            tz_config: Some(RuntimeTzConfig {
+                local_tz: chrono_tz::UTC,
+                default_input_tz: chrono_tz::UTC,
+            }),
+            ..Default::default()
+        };
+
+        let (result_data, _result_signals) =
+            eval_vegafusion_transforms(&dataset, transform_specs.as_slice(), &config);
+
+        assert_eq!(
+            result_data.pretty_format(None).unwrap(),
+            "\
++-------------+-------+-------+----------------+
+| Major Genre | is_pg | Title | it_is_selected |
++-------------+-------+-------+----------------+
+| Adventure   | true  | A     | true           |
+| Comedy      | true  | B     | false          |
+| Documentary | true  | C     | false          |
+| Comedy      | false | D     | true           |
+| Adventure   | true  | E     | true           |
++-------------+-------+-------+----------------+"
+        )
+    }
+}