Merge branch 'v7.0-dev-feat/performance' into v6.3.5-dev

Author: StuartWheater

R/ds.colnames.R

@@ -1,51 +1,51 @@
 #'
 #' @title Produces column names of the R object in the server-side
-#' @description Retrieves column names of an R object on the server-side.  
+#' @description Retrieves column names of an R object on the server-side.
 #' This function is similar to R function \code{colnames}.
-#' @details The input is restricted to the object of type \code{data.frame} or \code{matrix}. 
-#' 
+#' @details The input is restricted to the object of type \code{data.frame} or \code{matrix}.
+#'
 #' Server function called: \code{colnamesDS}
 #' @param x a character string providing the name of the input data frame or matrix.
-#' @param datasources a list of \code{\link[DSI]{DSConnection-class}} objects obtained after login. 
+#' @param datasources a list of \code{\link[DSI]{DSConnection-class}} objects obtained after login.
 #' If the \code{datasources} argument is not specified
 #' the default set of connections will be used: see \code{\link[DSI]{datashield.connections_default}}.
-#' @return \code{ds.colnames} returns the column names of 
-#' the specified server-side data frame or matrix. 
+#' @return \code{ds.colnames} returns the column names of
+#' the specified server-side data frame or matrix.
 #' @author DataSHIELD Development Team
 #' @seealso \code{\link{ds.dim}} to obtain the dimensions of a matrix or a data frame.
-#' @examples 
+#' @examples
 #' \dontrun{
-#' 
+#'
 #'   ## Version 6, for version 5 see the Wiki
 #'   # Connecting to the Opal servers
-#' 
+#'
 #'   require('DSI')
 #'   require('DSOpal')
 #'   require('dsBaseClient')
-#' 
+#'
 #'   builder <- DSI::newDSLoginBuilder()
-#'   builder$append(server = "study1", 
-#'                  url = "http://192.168.56.100:8080/", 
-#'                  user = "administrator", password = "datashield_test&", 
+#'   builder$append(server = "study1",
+#'                  url = "http://192.168.56.100:8080/",
+#'                  user = "administrator", password = "datashield_test&",
 #'                  table = "CNSIM.CNSIM1", driver = "OpalDriver")
-#'   builder$append(server = "study2", 
-#'                  url = "http://192.168.56.100:8080/", 
-#'                  user = "administrator", password = "datashield_test&", 
+#'   builder$append(server = "study2",
+#'                  url = "http://192.168.56.100:8080/",
+#'                  user = "administrator", password = "datashield_test&",
 #'                  table = "CNSIM.CNSIM2", driver = "OpalDriver")
 #'   builder$append(server = "study3",
-#'                  url = "http://192.168.56.100:8080/", 
-#'                  user = "administrator", password = "datashield_test&", 
+#'                  url = "http://192.168.56.100:8080/",
+#'                  user = "administrator", password = "datashield_test&",
 #'                  table = "CNSIM.CNSIM3", driver = "OpalDriver")
 #'   logindata <- builder$build()
-#'   
+#'
 #'   # Log onto the remote Opal training servers
-#'   connections <- DSI::datashield.login(logins = logindata, assign = TRUE, symbol = "D") 
-#' 
+#'   connections <- DSI::datashield.login(logins = logindata, assign = TRUE, symbol = "D")
+#'
 #'   # Getting column names of the R objects stored in the server-side
 #'   ds.colnames(x = "D",
 #'               datasources = connections[1]) #only the first server ("study1") is used
 #'   # Clear the Datashield R sessions and logout
-#'   datashield.logout(connections) 
+#'   datashield.logout(connections)
 #' }
 #' @export
 #'
@@ -65,17 +65,6 @@ ds.colnames <- function(x=NULL, datasources=NULL) {
     stop("Please provide the name of a data.frame or matrix!", call.=FALSE)
   }
 
-  # check if the input object(s) is(are) defined in all the studies
-  defined <- isDefined(datasources, x)
-
-  # call the internal function that checks the input object is of the same class in all studies.
-  typ <- checkClass(datasources, x)
-
-  # if the input object is not a matrix or a dataframe stop
-  if(!('data.frame' %in% typ) & !('matrix' %in% typ)){
-    stop("The input vector must be of type 'data.frame' or a 'matrix'!", call.=FALSE)
-  }
-
   cally <- call("colnamesDS", x)
   column_names <- DSI::datashield.aggregate(datasources, cally)
 

tests/testthat/test-smk-ds.colnames.R

@@ -25,6 +25,7 @@ test_that("setup", {
 # Tests
 #
 
+options(datashield.errors.print = TRUE)
 # context("ds.colnames::smk")
 test_that("simple colnames", {
     myvectors <- c("D$LAB_TSC", "D$LAB_TRIG")
@@ -44,6 +45,22 @@ test_that("simple colnames", {
     expect_equal(res$sim3[2], "LAB_TRIG")
 })
 
+test_that("fails if the object does not exist", {
+  expect_error(
+    ds.colnames("non_existing_df"),
+    regexp = "'non_existing_df' does not exist",
+    ignore.case = TRUE
+  )
+})
+
+test_that("fails if object is not a data frame or matrix", {
+  expect_error(
+    ds.colnames("D$LAB_TSC"),
+    regexp = "must be of type data.frame or matrix",
+    ignore.case = TRUE
+  )
+})
+
 #
 # Done
 #