Merge pull request #198 from r-dbi/b-roundtrip-time

- `"roundtrip_timestamp"` tests now accept a time zone set by the database backend (#198).
r-dbi · Oct 26, 2020 · 8c99358 · 8c99358
2 parents d095528 + 0f8eb42
commit 8c99358
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/R/spec-sql-append-table.R b/R/spec-sql-append-table.R
@@ -343,7 +343,7 @@ spec_sql_append_table <- list(
         86400 * 90, 86400 * 180, 86400 * 270,
         1e9, 5e9
       )
-    attr(local, "tzone") <- NULL
+    attr(local, "tzone") <- ""
     tbl_in <- data.frame(id = seq_along(local))
     tbl_in$local <- local
     tbl_in$GMT <- lubridate::with_tz(local, tzone = "GMT")
@@ -357,8 +357,9 @@ spec_sql_append_table <- list(
       con, tbl_in,
       transform = function(out) {
         dates <- vapply(out, inherits, "POSIXt", FUN.VALUE = logical(1L))
-        zoned <- dates & (names(out) != "local")
-        out[zoned] <- Map(lubridate::with_tz, out[zoned], names(out)[zoned])
+        tz <- names(out)
+        tz[tz == "local"] <- ""
+        out[dates] <- Map(lubridate::with_tz, out[dates], tz[dates])
         out
       }
     )

diff --git a/R/spec-sql-write-table.R b/R/spec-sql-write-table.R
@@ -483,7 +483,7 @@ spec_sql_write_table <- list(
         86400 * 90, 86400 * 180, 86400 * 270,
         1e9, 5e9
       )
-    attr(local, "tzone") <- NULL
+    attr(local, "tzone") <- ""
     tbl_in <- data.frame(id = seq_along(local))
     tbl_in$local <- local
     tbl_in$GMT <- lubridate::with_tz(local, tzone = "GMT")
@@ -496,8 +496,9 @@ spec_sql_write_table <- list(
       con, tbl_in,
       transform = function(out) {
         dates <- vapply(out, inherits, "POSIXt", FUN.VALUE = logical(1L))
-        zoned <- dates & (names(out) != "local")
-        out[zoned] <- Map(lubridate::with_tz, out[zoned], names(out)[zoned])
+        tz <- names(out)
+        tz[tz == "local"] <- ""
+        out[dates] <- Map(lubridate::with_tz, out[dates], tz[dates])
         out
       }
     )