Merge branch 'cran-1.4.4'

r-dbi · May 3, 2022 · e805135 · e805135
2 parents 83f86a2 + 78afa16
commit e805135
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git 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

diff --git a/cran-comments.md b/cran-comments.md
@@ -14,4 +14,4 @@ RPostgres 1.4.4
 
 - [x] Checked on 2022-05-01, problems found: https://cran.r-project.org/web/checks/check_results_RPostgres.html
 - [x] ERROR: r-devel-linux-x86_64-debian-gcc: Missing bit64 package on check system?
-- [ ] NOTE: r-release-macos-arm64, r-release-macos-x86_64, r-oldrel-macos-arm64, r-oldrel-macos-x86_64, r-oldrel-windows-ix86+x86_64: Large binary.
+- [x] NOTE: r-release-macos-arm64, r-release-macos-x86_64, r-oldrel-macos-arm64, r-oldrel-macos-x86_64, r-oldrel-windows-ix86+x86_64: Large binary.