Fixed tests

R/select.R

@@ -31,11 +31,7 @@ dbxSelect <- function(conn, statement, params=NULL) {
   # typecasting
   if (isRPostgreSQL(conn)) {
     sql_types <- tolower(column_info$type)
-
-    if (storageTimeZone(conn) != currentTimeZone()) {
-      convert_tz <- which(sql_types == "timestamp")
-    }
-
+    convert_tz <- which(sql_types == "timestamp")
     unescape_blobs <- which(sql_types == "bytea")
     fix_timetz <- which(sql_types == "timetzoid")
   } else if (isRPostgres(conn)) {

tests/testthat/helper-in-time-zone.R

@@ -1,9 +1,13 @@
 inTimeZone <- function(tz, code) {
-  previous_tz <- Sys.getenv("TZ", Sys.timezone())
+  previous_tz <- currentTimeZone()
   tryCatch({
     Sys.setenv(TZ=tz)
     eval(code)
   }, finally={
     Sys.setenv(TZ=previous_tz)
   })
 }
+
+currentTimeZone <- function() {
+  Sys.getenv("TZ", Sys.timezone())
+}

tests/testthat/test-postgres.R

@@ -20,7 +20,7 @@ test_that("datetimes with storage_tz works", {
     dbxInsert(db2, "events", events)
 
     # for R-devel
-    attr(events$updated_at, "tzone") <- Sys.timezone()
+    attr(events$updated_at, "tzone") <- currentTimeZone()
 
     # test returned time
     res <- dbxSelect(db2, "SELECT * FROM events ORDER BY id")

tests/testthat/test-postgresql.R

@@ -24,7 +24,7 @@ test_that("datetimes with storage_tz works", {
     dbxInsert(db2, "events", events)
 
     # for R-devel
-    attr(events$updated_at, "tzone") <- Sys.timezone()
+    attr(events$updated_at, "tzone") <- currentTimeZone()
 
     # test returned time
     res <- dbxSelect(db2, "SELECT * FROM events ORDER BY id")