Various fixes including ds.colnames, datasources handling

Author: StuartWheater

.Rbuildignore

@@ -15,6 +15,7 @@
 ^docker-compose_opal\.yml$
 ^docker-compose\.yml$
 ^R/secure.global.ranking.md$
+^PULL_REQUEST_TEMPLATE\.md\.R$
 ^_pkgdown\.yml$
 ^docs$
 ^dsBase_7.0.0\.tar\.gz$

DESCRIPTION

@@ -69,6 +69,7 @@ Imports:
     gridExtra,
     data.table,
     methods,
+    cli,
     dplyr
 Suggests:
     lme4,

NAMESPACE

@@ -119,6 +119,8 @@ export(ds.var)
 export(ds.vectorCalc)
 import(DSI)
 import(data.table)
+importFrom(DSI,datashield.connections_find)
+importFrom(cli,cli_abort)
 importFrom(stats,as.formula)
 importFrom(stats,na.omit)
 importFrom(stats,ts)

R/ds.colnames.R

@@ -51,7 +51,7 @@
 #'
 ds.colnames <- function(x=NULL, datasources=NULL) {
 
-  .set_datasources(datasources)
+  datasources <- .set_datasources(datasources)
   .check_df_name_provided(x)
 
   cally <- call("colnamesDS", x)

man/ds.colnames.Rd

@@ -47,7 +47,8 @@ test_that("simple colnames", {
 test_that("fails if the object does not exist", {
   expect_error(
     ds.colnames("non_existing_df"),
-    regexp = "object 'non_existing_df' not found",
+#    regexp = "object 'non_existing_df' not found",
+    regexp = "There are some DataSHIELD errors, list them with datashield.errors()",
     ignore.case = TRUE
   )
 })