internal renames and fixed one DBI test so that it also works with RJDBC

Author: Stefan Fleck

R/Layout.R

@@ -399,7 +399,7 @@ LayoutDbi <- R6::R6Class(
         !is.null(private$.col_types),
         "To create new database tables the Layout must contain `col_types`"
       )
-      generate_sql_create_table(
+      sql_create_table(
         tname = table,
         col_types = private$.col_types,
         col_names = names(private$.col_types)

R/utils.R

@@ -125,13 +125,13 @@ ptrunc_col <- function(
 #' @noRd
 #'
 #' @examples
-#' generate_sql_create_table(
+#' sql_create_table(
 #'   "example.table",
 #'   c("numbers", "animals"),
 #'   c("integer", "varchar(8)"),
 #'   c("NOT NULL", "")
 #' )
-generate_sql_create_table <- function(
+sql_create_table <- function(
   tname,
   col_names,
   col_types,

man/Logger.Rd

@@ -70,7 +70,7 @@ dbs <- list(
 options("datatable.showProgress" = dt_sp)
 
 nm <- "SQLite via RSQLite"  # for manual testing, can be deleted
-nm <- "PostgreSQL via RPostgreSQL" # for manual testing, can be deleted
+nm <- "DB2 via RJDBC" # for manual testing, can be deleted
 
 
 
@@ -252,7 +252,12 @@ for (nm in names(dbs)){
 
     # cleanup
     expect_true(
-      DBI::dbRemoveTable(conn, lg$appenders$db$layout$format_table_name("LOGGING_TEST_BUFFER"))
+      x <- tryCatch({
+        r <- DBI::dbRemoveTable(conn, lg$appenders$db$layout$format_table_name("LOGGING_TEST_BUFFER"))
+        if (!length(r)) TRUE else r # for RJDBC
+      },
+        error = function(e) FALSE # for RJDBC
+      )
     )
   })
 

tests/testthat/test_AppenderDbi.R

@@ -107,28 +107,28 @@ test_that("generate_sql works as expected", {
            "GRAPHIC(80)", "VARGRAPHIC(80)", "DBCLOB(80)", "BLOB(80)", "FAIL")
   co1 <- c(rep("NOT NULL", length(ct1)))
 
-  expect_silent(generate_sql_create_table("testtable", cn1[1:3], ct1[1:3]))
+  expect_silent(sql_create_table("testtable", cn1[1:3], ct1[1:3]))
   expect_error(
-    generate_sql_create_table("testtable", cn1[1:3], ct1[1:2]),
+    sql_create_table("testtable", cn1[1:3], ct1[1:2]),
     "is_equal_length"
   )
 
   ct1[[1]] <- NA
 
   expect_message(
-    generate_sql_create_table("testtable", cn1[1:3], ct1[1:3]),
+    sql_create_table("testtable", cn1[1:3], ct1[1:3]),
     "Skipping 1"
   )
 
   cn1[[1]] <- NA
   expect_error(
-    generate_sql_create_table("testtable", cn1[1:3], ct1[1:3]),
+    sql_create_table("testtable", cn1[1:3], ct1[1:3]),
     "must be unique"
   )
 
   cn1[[1]] <- "B"
   expect_error(
-    generate_sql_create_table("testtable", cn1[1:3], ct1[1:3]),
+    sql_create_table("testtable", cn1[1:3], ct1[1:3]),
     "must be unique"
   )
 })