Merge pull request #148 from duckdb/f-dbitest

duckdb · Apr 29, 2024 · b330abb · b330abb
2 parents 5013908 + 05c7171
commit b330abb
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
diff --git a/R/dbFetch__duckdb_result.R b/R/dbFetch__duckdb_result.R
@@ -26,7 +26,7 @@ dbFetch__duckdb_result <- function(res, n = -1, ...) {
   if (length(n) != 1) {
     stop("need exactly one value in n")
   }
-  if (is.infinite(n)) {
+  if (is.infinite(n) || is.na(n)) {
     n <- -1
   }
   if (n < -1) {

diff --git a/R/dbQuoteLiteral__duckdb_connection.R b/R/dbQuoteLiteral__duckdb_connection.R
@@ -17,6 +17,10 @@ dbQuoteLiteral__duckdb_connection <- function(conn, x, ...) {
   }
 
   if (inherits(x, "POSIXt")) {
+    if (length(x) == 0) {
+      return(SQL(character()))
+    }
+
     out <- dbQuoteString(
       conn,
       strftime(as.POSIXct(x), "%Y-%m-%d %H:%M:%S", tz = "UTC")
@@ -26,11 +30,19 @@ dbQuoteLiteral__duckdb_connection <- function(conn, x, ...) {
   }
 
   if (inherits(x, "Date")) {
+    if (length(x) == 0) {
+      return(SQL(character()))
+    }
+
     out <- callNextMethod()
     return(SQL(paste0(out, "::date")))
   }
 
   if (inherits(x, "difftime")) {
+    if (length(x) == 0) {
+      return(SQL(character()))
+    }
+
     out <- callNextMethod()
     return(SQL(paste0(out, "::time")))
   }

diff --git a/tests/testthat/helper-DBItest.R b/tests/testthat/helper-DBItest.R
@@ -12,6 +12,7 @@ if (rlang::is_installed("DBItest")) DBItest::make_context(
   # dblog::dblog(drv),
   list(debug = FALSE),
   tweaks = DBItest::tweaks(
+    dbitest_version = "1.8.1",
     omit_blob_tests = FALSE,
     temporary_tables = FALSE,
     placeholder_pattern = "?",

diff --git a/tests/testthat/test-DBItest.R b/tests/testthat/test-DBItest.R
@@ -184,5 +184,10 @@ if (rlang::is_installed("DBItest")) DBItest::test_all(c(
   "write_table_row_names_na_missing",
   "append_roundtrip_factor",
   "bind_factor",
+  "arrow_bind_factor",
+  "arrow_send_query_stale_warning", # wontfix
+  "arrow_send_query_only_one_result_set", # wontfix
+  "arrow_write_table_arrow_roundtrip_timestamp_extended", # precision
+  "arrow_append_table_arrow_roundtrip_timestamp_extended", # precision
   NULL
 ))