Merge branch 'main' into populations

Public-Health-Scotland · Oct 7, 2024 · 1addc4c · 1addc4c
2 parents c09ddff + 4d85123
commit 1addc4c
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 4 deletions.
diff --git a/R/get_simd_postcode.R b/R/get_simd_postcode.R
@@ -41,7 +41,7 @@ get_simd_postcode <- function(
 
   return(read_file(
     simd_postcode_path,
-    col_select = col_select,
+    col_select = {{ col_select }},
     as_data_frame = as_data_frame
   ))
 }
diff --git a/R/get_spd.R b/R/get_spd.R
@@ -29,7 +29,7 @@ get_spd <- function(
 
   return(read_file(
     spd_path,
-    col_select = col_select,
+    col_select = {{ col_select }},
     as_data_frame = as_data_frame
   ))
 }
diff --git a/R/read_file.R b/R/read_file.R
@@ -29,7 +29,7 @@ read_file <- function(path, col_select = NULL, as_data_frame = TRUE, ...) {
     ))
   }
 
-  if ((!missing(col_select) || !missing(as_data_frame)) && ext != "parquet") {
+  if ((!rlang::quo_is_null(rlang::enquo(col_select)) || !missing(as_data_frame)) && ext != "parquet") {
     cli::cli_abort(c(
       "x" = "{.arg col_select} and/or {.arg as_data_frame} must only be used
         when reading a {.field .parquet} file."
@@ -41,7 +41,7 @@ read_file <- function(path, col_select = NULL, as_data_frame = TRUE, ...) {
     "csv" = readr::read_csv(file = path, ..., show_col_types = FALSE),
     "parquet" = tibble::as_tibble(arrow::read_parquet(
       file = path,
-      col_select = !!col_select,
+      col_select = {{ col_select }},
       as_data_frame = as_data_frame,
       ...
     ))

diff --git a/tests/testthat/test-get_simd_postcode.R b/tests/testthat/test-get_simd_postcode.R
@@ -26,3 +26,17 @@ test_that("col selection works", {
   ) |>
     expect_message()
 })
+
+test_that("col selection works with tidyselect", {
+  expect_named(
+    get_simd_postcode(col_select = c("pc7", dplyr::starts_with("simd")))
+  ) |>
+    expect_message()
+
+  expect_named(
+    get_simd_postcode(col_select = dplyr::matches("pc[78]")),
+    c("pc7", "pc8"),
+    ignore.order = TRUE
+  ) |>
+    expect_message()
+})
diff --git a/tests/testthat/test-get_spd.R b/tests/testthat/test-get_spd.R
@@ -26,3 +26,16 @@ test_that("col selection works", {
   ) |>
     expect_message()
 })
+
+test_that("col selection works with tidyselect", {
+  expect_named(
+    get_spd(col_select = c("pc7", dplyr::starts_with("hb")))
+  ) |>
+    expect_message()
+
+  expect_named(
+    get_spd(col_select = dplyr::matches("pc[78]")),
+    c("pc7", "pc8")
+  ) |>
+    expect_message()
+})