aboutsummaryrefslogtreecommitdiff
path: root/R
diff options
context:
space:
mode:
Diffstat (limited to 'R')
-rw-r--r--R/pkg/R/DataFrame.R6
-rw-r--r--R/pkg/inst/tests/testthat/test_sparkSQL.R8
2 files changed, 10 insertions, 4 deletions
diff --git a/R/pkg/R/DataFrame.R b/R/pkg/R/DataFrame.R
index bfec3245cf..fefe25b148 100644
--- a/R/pkg/R/DataFrame.R
+++ b/R/pkg/R/DataFrame.R
@@ -323,10 +323,8 @@ setMethod("names",
setMethod("names<-",
signature(x = "SparkDataFrame"),
function(x, value) {
- if (!is.null(value)) {
- sdf <- callJMethod(x@sdf, "toDF", as.list(value))
- dataFrame(sdf)
- }
+ colnames(x) <- value
+ x
})
#' @rdname columns
diff --git a/R/pkg/inst/tests/testthat/test_sparkSQL.R b/R/pkg/inst/tests/testthat/test_sparkSQL.R
index 417a03ff61..418f128ce8 100644
--- a/R/pkg/inst/tests/testthat/test_sparkSQL.R
+++ b/R/pkg/inst/tests/testthat/test_sparkSQL.R
@@ -869,6 +869,14 @@ test_that("names() colnames() set the column names", {
colnames(df) <- c("col3", "col4")
expect_equal(names(df)[1], "col3")
+ expect_error(names(df) <- NULL, "Invalid column names.")
+ expect_error(names(df) <- c("sepal.length", "sepal_width"),
+ "Column names cannot contain the '.' symbol.")
+ expect_error(names(df) <- c(1, 2), "Invalid column names.")
+ expect_error(names(df) <- c("a"),
+ "Column names must have the same length as the number of columns in the dataset.")
+ expect_error(names(df) <- c("1", NA), "Column names cannot be NA.")
+
expect_error(colnames(df) <- c("sepal.length", "sepal_width"),
"Column names cannot contain the '.' symbol.")
expect_error(colnames(df) <- c(1, 2), "Invalid column names.")