Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DBI::SQL() elements should be collapsed correctly #192

Merged
merged 2 commits into from
Jun 4, 2020
Merged

DBI::SQL() elements should be collapsed correctly #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce75b3c
DBI::SQL() elements should be collapsed correctly. This is a regressi…
shrektan Jun 3, 2020
d3688a6
update NEWS
shrektan Jun 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# glue (development version)

* The required version of R is now 3.2 (#189)
* `glue_sql()` now collapses `DBI::SQL()` elements correctly (#192 @shrektan)

# glue 1.4.1

Expand Down
3 changes: 3 additions & 0 deletions R/sql.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,9 @@ sql_quote_transformer <- function(connection, .na) {
} else {
res <- eval(parse(text = text, keep.source = FALSE), envir)
if (inherits(res, "SQL")) {
if (should_collapse) {
res <- glue_collapse(res, ", ")
}
return(res)
}

Expand Down
4 changes: 4 additions & 0 deletions tests/testthat/test-sql.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,10 @@ describe("glue_sql", {
expect_identical(glue_sql("x IN ({c(NA, 1L)*})", .con = con), DBI::SQL(paste0("x IN (NULL, 1)")))
expect_identical(glue_sql("x IN ({c(NA, TRUE)*})", .con = con), DBI::SQL(paste0("x IN (NULL, TRUE)")))
})

it("should handle DBI::SQL() elements correctly when collapsing (#191)", {
expect_identical(glue_sql("x IN ({DBI::SQL(c('a','b'))*})", .con = con), DBI::SQL(paste0("x IN (a, b)")))
})
})

describe("glue_data_sql", {
Expand Down