From c4e74a2fa92920b15f6affb9f541bdd275310a02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kirill=20M=C3=BCller?= Date: Sun, 1 May 2022 16:37:14 +0200 Subject: [PATCH] Use tryCatch() --- R/dbConnect_PqDriver.R | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/R/dbConnect_PqDriver.R b/R/dbConnect_PqDriver.R index a867b7a7..14614cf3 100644 --- a/R/dbConnect_PqDriver.R +++ b/R/dbConnect_PqDriver.R @@ -109,13 +109,12 @@ dbConnect_PqDriver <- function(drv, dbname = NULL, conn@timezone <- timezone conn@timezone_out <- timezone_out - typnames <- try(dbGetQuery(conn, "SELECT oid, typname FROM pg_type", immediate = TRUE), silent = TRUE) - - if (inherits(typnames, "try-error")) { - typnames <- data.frame(typname = character(), oid = character()) - } - - conn@typnames <- typnames + conn@typnames <- tryCatch( + dbGetQuery(conn, "SELECT oid, typname FROM pg_type", immediate = TRUE), + error = function(e) { + data.frame(typname = character(), oid = character()) + } + ) on.exit(NULL) conn