From ede42ce53b443449f682391ce2d142bb077cde0d Mon Sep 17 00:00:00 2001 From: detule Date: Sat, 5 Apr 2025 17:23:05 +0000 Subject: [PATCH 1/3] db2: Fixup temp table lookup --- R/driver-db2.R | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/R/driver-db2.R b/R/driver-db2.R index c325c592b..72f1647f5 100644 --- a/R/driver-db2.R +++ b/R/driver-db2.R @@ -68,7 +68,9 @@ setMethod("odbcConnectionTables", c("DB2/AIX64", "character"), tryCatch({ dfTempTables <- dbGetQuery(conn, query) # NULL as colname is not well liked by DB2 it seems. Hack here. - dfTempTables$table_remarks <- NA_character_ + if (nrow(dfTempTables)) { + dfTempTables$table_remarks <- NA_character_ + } }, odbc_database_error = function(e) { cli::cli_warn("Unable to query for temporary tables in SYSIBMADM.ADMINTEMPTABLES") }) From 5b51fa79d11c73c5e78a4db8bed74451c5fbecad Mon Sep 17 00:00:00 2001 From: detule Date: Sun, 27 Apr 2025 06:47:20 -0400 Subject: [PATCH 2/3] Update R/driver-db2.R Co-authored-by: Simon P. Couch --- R/driver-db2.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/driver-db2.R b/R/driver-db2.R index 72f1647f5..18cab76e6 100644 --- a/R/driver-db2.R +++ b/R/driver-db2.R @@ -67,7 +67,7 @@ setMethod("odbcConnectionTables", c("DB2/AIX64", "character"), "WHERE 1 = 1 ", qTable, qSchema) tryCatch({ dfTempTables <- dbGetQuery(conn, query) - # NULL as colname is not well liked by DB2 it seems. Hack here. + # NULL as colname is not well liked by DB2 it seems. Hack here. (#905). if (nrow(dfTempTables)) { dfTempTables$table_remarks <- NA_character_ } From e81b950c06d71562ccca38331fc3d5de6e045980 Mon Sep 17 00:00:00 2001 From: detule Date: Sun, 27 Apr 2025 06:47:33 -0400 Subject: [PATCH 3/3] Update R/driver-db2.R Co-authored-by: Simon P. Couch --- R/driver-db2.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/driver-db2.R b/R/driver-db2.R index 18cab76e6..9ec8c4bbb 100644 --- a/R/driver-db2.R +++ b/R/driver-db2.R @@ -68,7 +68,7 @@ setMethod("odbcConnectionTables", c("DB2/AIX64", "character"), tryCatch({ dfTempTables <- dbGetQuery(conn, query) # NULL as colname is not well liked by DB2 it seems. Hack here. (#905). - if (nrow(dfTempTables)) { + if (nrow(dfTempTables) > 0) { dfTempTables$table_remarks <- NA_character_ } }, odbc_database_error = function(e) {