Fixup/oracle dates

NEWS.md

@@ -1,5 +1,7 @@
 # odbc (development version)
 
+* oracle: Fix writing to DATE and TIMESTAMP(n) targets using `batch_size` > 1.
+
 * Raises "Cancelling previous query" warnings from R rather than from Rcpp when 
  a connection has a current result to avoid possible incorrect resource 
  unwinds with `options(warn = 2)` (#797).

R/dbi-table.R

@@ -157,7 +157,7 @@ setMethod("dbAppendTable", "OdbcConnection",
  )
  rs <- OdbcResult(conn, sql)
 
- if (!is.null(fieldDetails) && nrow(fieldDetails) == nparam) {
+ if (!is.null(fieldDetails) && nrow(fieldDetails) <= nparam) {
  result_describe_parameters(rs@ptr, fieldDetails)
  }
 

R/driver-oracle.R

@@ -122,7 +122,12 @@ setMethod("odbcConnectionColumns_", c("Oracle", "character"),
  )
  }
 
- dbGetQuery(conn, query)
+ res <- dbGetQuery(conn, query)
+
+ res$data_type <- as.numeric(res$data_type)
+ res[res$`field.type` == "DATE", c("data_type", "column_size")] <- c(91, 6)
+ res[grepl("TIMESTAMP", res$`field.type`), c("data_type", "column_size")] <- c(93, 16)
+ res
  }
 )
 

tests/testthat/test-driver-oracle.R

@@ -1,12 +1,13 @@
 test_that("can round columns", {
  con <- test_con("ORACLE")
- # - Long/outstanding issue with batch inserting
- # date/datetime for Oracle. See for example
- # #349, #350, #391
+ # - Date does not roundtrip correctly since
+ # their DATE data-type contains hour/min/seconds.
+ # To avoid loss of precision we read it in as
+ # POSIXct.
  # - There also looks like there are issues related
- # to binary elements of size zero.
+ #  to binary elements of size zero.
  # - Finally, no boolean in Oracle prior to 23
- test_roundtrip(con, columns = c("time", "date", "datetime", "binary", "logical"))
+ test_roundtrip(con, columns = c("time", "date", "binary", "logical"))
 })
 
 test_that("can detect existence of table", {
@@ -18,3 +19,19 @@ test_that("can detect existence of table", {
  tbl2 <- local_table(con, "mtcars_test", mtcars)
  expect_true(dbExistsTable(con, tbl2))
 })
+
+test_that("Writing date/datetime with batch size > 1", {
+ # See #349, #350, #391
+ con <- test_con("ORACLE")
+
+ ir <- datasets::iris
+ values <- data.frame(
+ datetime = as.POSIXct(as.numeric(ir$Petal.Length * 10), origin = "2024-01-01", tz = "UTC"),
+ date = as.Date(as.numeric(ir$Petal.Length * 10), origin = "2024-01-01", tz = "UTC"),
+ integer = as.integer(ir$Petal.Width * 100),
+ double = ir$Sepal.Length,
+ varchar = ir$Species)
+ tbl <- local_table(con, "test_batched_write_w_dates", values)
+ res <- dbReadTable(con, "test_batched_write_w_dates")
+ expect_true(nrow(res) == nrow(values))
+})