Skip to content

Commit

Permalink
fix: deprecation of .data: r-lib/tidyselect#169
Browse files Browse the repository at this point in the history
  • Loading branch information
nbc committed Feb 25, 2023
1 parent d4b51e2 commit fa5a2da
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions R/list-attachments.R
Expand Up @@ -30,6 +30,6 @@ list_attachments <- function(dataset = NULL) {
return(tibble() %>% add_columns_if_empty(c("id", "rid", "title")))
}
if (!is.null(dataset)) ds <- filter(ds, .data$id == get_dataset_id(dataset))
df <- dplyr::select(ds, .data$id, .data$attachments)
as_tibble(tidyr::unnest(df, .data$attachments)) %>% add_columns_if_empty(c("id", "rid", "title"))
df <- dplyr::select(ds, "id", "attachments")
as_tibble(tidyr::unnest(df, "attachments")) %>% add_columns_if_empty(c("id", "rid", "title"))
}
4 changes: 2 additions & 2 deletions R/list-datafiles.R
Expand Up @@ -30,7 +30,7 @@ list_datafiles <- function(dataset = NULL) {
}
if (!is.null(dataset)) ds <- filter(ds, .data$id == get_dataset_id(dataset))

df <- dplyr::select(ds, .data$id, .data$datafiles)
as_tibble(tidyr::unnest(df, .data$datafiles)) %>%
df <- dplyr::select(ds, "id", "datafiles")
as_tibble(tidyr::unnest(df, "datafiles")) %>%
add_columns_if_empty(c("id", "rid", "title", "description"))
}
4 changes: 2 additions & 2 deletions R/list-millesimes.R
Expand Up @@ -23,6 +23,6 @@ list_millesimes <- function(data = NULL) {

if (!is.null(data)) df <- filter(df, .data$rid == get_datafile_rid(data))

ml <- dplyr::select(df, .data$id, .data$rid, .data$millesimes_info)
as_tibble(tidyr::unnest(ml, .data$millesimes_info))
ml <- dplyr::select(df, "id", "rid", "millesimes_info")
as_tibble(tidyr::unnest(ml, "millesimes_info"))
}

0 comments on commit fa5a2da

Please sign in to comment.