fix: dbQuoteLiteral() uses exponential notation for numeric values

krlmlr · krlmlr · commit af078908a270 · 2024-04-01T19:23:33.000+02:00
diff --git a/R/dbQuoteLiteral_DBIConnection.R b/R/dbQuoteLiteral_DBIConnection.R
@@ -48,8 +48,14 @@ dbQuoteLiteral_DBIConnection <- function(conn, x, ...) {
     return(SQL(blob_data, names = names(x)))
   }
 
+  if (is.double(x)) {
+    out <- sprintf("%.17e", x)
+    out[is.na(x)] <- "NULL"
+    return(SQL(out, names = names(x)))
+  }
+
   if (is.logical(x)) {
-    x <- as.numeric(x)
+    x <- as.integer(x)
   }
 
   x <- as.character(x)
diff --git a/tests/testthat/test-sql-df.R b/tests/testthat/test-sql-df.R
@@ -6,6 +6,6 @@ test_that("NAs turn in NULLs", {
   )
   sql_df <- sqlData(ANSI(), df)
 
-  expect_equal(sql_df$x, SQL(c("1", "NULL")))
+  expect_equal(sql_df$x, SQL(c("1.00000000000000000e+00", "NULL")))
   expect_equal(sql_df$y, SQL(c("'a'", "NULL")))
 })

Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,14 @@ dbQuoteLiteral_DBIConnection <- function(conn, x, ...) {`
`48`	`48`	`return(SQL(blob_data, names = names(x)))`
`49`	`49`	`}`
`50`	`50`
	`51`	`+ if (is.double(x)) {`
	`52`	`+ out <- sprintf("%.17e", x)`
	`53`	`+ out[is.na(x)] <- "NULL"`
	`54`	`+ return(SQL(out, names = names(x)))`
	`55`	`+ }`
	`56`	`+`
`51`	`57`	`if (is.logical(x)) {`
`52`		`- x <- as.numeric(x)`
	`58`	`+ x <- as.integer(x)`
`53`	`59`	`}`
`54`	`60`
`55`	`61`	`x <- as.character(x)`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,6 @@ test_that("NAs turn in NULLs", {`
`6`	`6`	`)`
`7`	`7`	`sql_df <- sqlData(ANSI(), df)`
`8`	`8`
`9`		`- expect_equal(sql_df$x, SQL(c("1", "NULL")))`
	`9`	`+ expect_equal(sql_df$x, SQL(c("1.00000000000000000e+00", "NULL")))`
`10`	`10`	`expect_equal(sql_df$y, SQL(c("'a'", "NULL")))`
`11`	`11`	`})`