Argument tweaking

r-dbi · Dec 12, 2023 · 8424780 · 8424780 · Odraio · Dec 12, 2023
1 parent b3292be
commit 8424780
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/R/Connection.R b/R/Connection.R
@@ -671,7 +671,7 @@ setMethod(
 #' @inheritParams DBI::dbFetch
 #' @export
 setMethod("dbGetQuery", signature("OdbcConnection", "character"),
-  function(conn, statement, n = -1, params = NULL, timeout = Inf, ...) {
+  function(conn, statement, ..., n = -1, params = NULL, timeout = Inf) {
     rs <- dbSendQuery(conn, statement, params = params, timeout = timeout, ...)
     on.exit(dbClearResult(rs))
 

diff --git a/R/Result.R b/R/Result.R
@@ -13,12 +13,16 @@ OdbcResult <- function(connection, statement, params = NULL, immediate = FALSE,
   if (nzchar(connection@encoding)) {
     statement <- enc2iconv(statement, connection@encoding)
   }
-
   if (is.infinite(timeout)) {
-    timeout <- 0
+    timeout <- 0L
   }
 
-  ptr <- new_result(connection@ptr, statement, immediate, timeout)
+  ptr <- new_result(
+    p = connection@ptr,
+    sql = statement,
+    immediate = immediate,
+    timeout = timeout
+  )
   res <- new("OdbcResult", connection = connection, statement = statement, ptr = ptr)
 
   if (!is.null(params)) {

diff --git a/man/OdbcConnection.Rd b/man/OdbcConnection.Rd