From 84ea0883af55d4b9528ac00c3c340565895a58a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kirill=20M=C3=BCller?= Date: Thu, 21 Dec 2023 04:11:06 +0100 Subject: [PATCH] Call `DBI::Id()` without names (#312) * Call Id() without names * Use dev DBI * Different way of doing CI against DBI release candidate --------- Co-authored-by: Jenny Bryan --- DESCRIPTION | 4 +++- R/sql.R | 10 +++++----- man/glue_sql.Rd | 10 +++++----- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 962377a..690ecd3 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -23,7 +23,7 @@ Imports: methods Suggests: crayon, - DBI (>= 1.1.3), + DBI (>= 1.2.0), dplyr, knitr, magrittr, @@ -43,3 +43,5 @@ Config/testthat/edition: 3 Encoding: UTF-8 Roxygen: list(markdown = TRUE) RoxygenNote: 7.2.3.9000 +Remotes: + r-dbi/DBI diff --git a/R/sql.R b/R/sql.R index d35d13e..ac03cde 100644 --- a/R/sql.R +++ b/R/sql.R @@ -114,13 +114,13 @@ #' DBI::dbWriteTable(con, nicknames_db, nicknames) #' #' cols <- list( -#' DBI::Id(table = iris_db, column = "sepal_length"), -#' DBI::Id(table = iris_db, column = "sepal_width"), -#' DBI::Id(table = nicknames_db, column = "nickname") +#' DBI::Id(iris_db, "sepal_length"), +#' DBI::Id(iris_db, "sepal_width"), +#' DBI::Id(nicknames_db, "nickname") #' ) #' -#' iris_species <- DBI::Id(table = iris_db, column = "species") -#' nicknames_species <- DBI::Id(table = nicknames_db, column = "species") +#' iris_species <- DBI::Id(iris_db, "species") +#' nicknames_species <- DBI::Id(nicknames_db, "species") #' #' query <- glue_sql(" #' SELECT {`cols`*} diff --git a/man/glue_sql.Rd b/man/glue_sql.Rd index 978ef61..a2d83a1 100644 --- a/man/glue_sql.Rd +++ b/man/glue_sql.Rd @@ -191,13 +191,13 @@ nicknames <- data.frame( DBI::dbWriteTable(con, nicknames_db, nicknames) cols <- list( - DBI::Id(table = iris_db, column = "sepal_length"), - DBI::Id(table = iris_db, column = "sepal_width"), - DBI::Id(table = nicknames_db, column = "nickname") + DBI::Id(iris_db, "sepal_length"), + DBI::Id(iris_db, "sepal_width"), + DBI::Id(nicknames_db, "nickname") ) -iris_species <- DBI::Id(table = iris_db, column = "species") -nicknames_species <- DBI::Id(table = nicknames_db, column = "species") +iris_species <- DBI::Id(iris_db, "species") +nicknames_species <- DBI::Id(nicknames_db, "species") query <- glue_sql(" SELECT {`cols`*}