Improve validate for zero-row dataframes (#119)

Author: bbimber

Rlabkey/DESCRIPTION

@@ -20,4 +20,4 @@ Copyright: Copyright (c) 2010-2018 LabKey Corporation
 LazyLoad: true
 Depends: httr, jsonlite
 LinkingTo: Rcpp
-Imports: Rcpp (>= 0.11.0)
+Imports: Rcpp (>= 0.11.0)

Rlabkey/NEWS

@@ -1,5 +1,6 @@
 Changes in 3.4.4
   o Issue 53481: additional validation for assay run configurations.
+  o Improve validation when a zero-row dataframe is passed to insertRows/updateRows/deleteRows
 
 Changes in 3.4.3
   o Bugfix to labkey.selectRows when group_concat based field has a NULL value. Related to github issue #112

Rlabkey/R/labkey.deleteRows.R

@@ -26,6 +26,7 @@ labkey.deleteRows <- function(baseUrl=NULL, folderPath, schemaName, queryName, t
     if (missing(schemaName)) stop (paste("A value must be specified for schemaName."))
     if (missing(queryName)) stop (paste("A value must be specified for queryName."))
     if (missing(toDelete)) stop (paste("A value must be specified for toDelete."))
+    if (nrow(toDelete) == 0) stop (paste("toDelete must contain at least one row."))
     if (!missing(options) & !is.list(options))
         stop (paste("The options parameter must be a list data structure."))
 

Rlabkey/R/labkey.importRows.R

@@ -26,6 +26,7 @@ labkey.importRows <- function(baseUrl=NULL, folderPath, schemaName, queryName, t
     if (missing(schemaName)) stop (paste("A value must be specified for schemaName."))
     if (missing(queryName)) stop (paste("A value must be specified for queryName."))
     if (missing(toImport)) stop (paste("A value must be specified for toImport."))
+    if (nrow(toImport) == 0) stop (paste("toImport must contain at least one row."))
 
     ## normalize the folder path
     folderPath <- encodeFolderPath(folderPath)

Rlabkey/R/labkey.insertRows.R

@@ -23,6 +23,7 @@ labkey.insertRows <- function(baseUrl=NULL, folderPath, schemaName, queryName, t
     if (missing(schemaName)) stop (paste("A value must be specified for schemaName."))
     if (missing(queryName)) stop (paste("A value must be specified for queryName."))
     if (missing(toInsert)) stop (paste("A value must be specified for toInsert."))
+    if (nrow(toInsert) == 0) stop (paste("toInsert must contain at least one row."))
     if (!missing(options) & !is.list(options))
         stop (paste("The options parameter must be a list data structure."))
 

Rlabkey/R/labkey.updateRows.R

@@ -26,6 +26,7 @@ labkey.updateRows <- function(baseUrl=NULL, folderPath, schemaName, queryName, t
     if (missing(schemaName)) stop (paste("A value must be specified for schemaName."))
     if (missing(queryName)) stop (paste("A value must be specified for queryName."))
     if (missing(toUpdate)) stop (paste("A value must be specified for toUpdate."))
+    if (nrow(toUpdate) == 0) stop (paste("toUpdate must contain at least one row."))
     if (!missing(options) & !is.list(options))
         stop (paste("The options parameter must be a list data structure."))
 

Rlabkey/R/makeDF.R

@@ -240,7 +240,7 @@ jsonEncodeRowsAndParams <- function(rows, params, na=NULL)
     p1 <- toJSON(params, auto_unbox=TRUE, digits = NA) # digits = NA to avoid trimming values (Issue 51160)
     cnames <- colnames(rows)
     p3 <- NULL
-    for(j in 1:nrows)
+    for(j in seq_len(nrows))
     {
         cvalues <- as.list(rows[j,])
         names(cvalues) <- cnames