Merge pull request #253 from Qrlew/251-dot-should-not-fail-when-chara…

…cters-are-not-properly-escaped-eg-or 251 dot should not fail when characters are not properly escaped eg or
Qrlew · Jan 17, 2024 · 8e278c1 · 8e278c1
2 parents 6d31978 + 19c4e5b
commit 8e278c1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Changed
+- Fixed [#251](https://github.com/Qrlew/qrlew/issues/251) and [#252](https://github.com/Qrlew/qrlew/issues/252)
 
 ## [0.9.4] - 2024-01-17
 ### Changed

diff --git a/src/relation/dot.rs b/src/relation/dot.rs
@@ -42,17 +42,17 @@ impl fmt::Display for FieldDataTypes {
                         shorten_string(&if let Some(c) = field.constraint() {
                             format!(
                                 "{} = {} ∈ {} {}",
-                                field.name(),
+                                dot::escape_html(&field.name().to_string()),
                                 dot::escape_html(&expr.to_string()),
-                                field.data_type(),
+                                dot::escape_html(&field.data_type().to_string()),
                                 c
                             )
                         } else {
                             format!(
                                 "{} = {} ∈ {}",
-                                field.name(),
+                                dot::escape_html(&field.name().to_string()),
                                 dot::escape_html(&expr.to_string()),
-                                field.data_type()
+                                dot::escape_html(&field.data_type().to_string()),
                             )
                         })
                     );
@@ -404,7 +404,9 @@ mod tests {
     #[test]
     fn test_escape_html() {
         namer::reset();
-        let schema: Schema = vec![("a", DataType::float())].into_iter().collect();
+        let schema: Schema = vec![
+            ("a", DataType::float()),
+            ("b", DataType::text_values(&["A&B".into(), "C>D".into()]))].into_iter().collect();
         let table: Relation = Relation::table()
             .name("table")
             .schema(schema.clone())