Merge branch 'master' into f-3-compound

cynkra · May 3, 2020 · 691a629 · 691a629
2 parents 63d9e9a + b1a9bd6
commit 691a629
Show file tree

Hide file tree

Showing 3 changed files with 110 additions and 2 deletions.
diff --git a/R/datamodelr-code.R b/R/datamodelr-code.R
@@ -320,7 +320,7 @@ to_html_table <- function(x,
  )
  ),
  # rows
- sapply(seq_len(nrow(x)), function(r) {
+ unique(sapply(seq_len(nrow(x)), function(r) {
  html_tr(c(
  # cells
  sapply(cols, function(col_name) {
@@ -329,7 +329,7 @@ to_html_table <- function(x,
  html_td(value, if (is.null(attr_td)) NULL else attr_td(col_name, x[r, ], value))
  })
  ))
- })
+ }))
  ))
 }
 

diff --git a/tests/testthat/out/nycflights13-multi-fk.svg b/tests/testthat/out/nycflights13-multi-fk.svg
diff --git a/tests/testthat/test-draw-dm.R b/tests/testthat/test-draw-dm.R
@@ -166,6 +166,17 @@ test_that("output", {
  "out/nycflights13.svg"
  )
 
+ # Multi-fk (#37)
+ expect_known_output(
+ dm_nycflights13() %>%
+ dm_zoom_to(planes) %>%
+ dm_insert_zoomed("planes_copy") %>%
+ dm_draw() %>%
+ DiagrammeRsvg::export_svg() %>%
+ cli::cat_line(),
+ "out/nycflights13-multi-fk.svg"
+ )
+
  expect_known_output(
  dm_nycflights13() %>%
  dm_add_pk(weather, c(origin, time_hour)) %>%