Skip to content

Commit 5c71cd3

Browse files
committed
Fix subset error when only set select argument
1 parent 3e7e05f commit 5c71cd3

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

R/pkg/R/DataFrame.R

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1209,7 +1209,11 @@ setMethod("[", signature(x = "DataFrame", i = "Column"),
12091209
#' }
12101210
setMethod("subset", signature(x = "DataFrame"),
12111211
function(x, subset, select, ...) {
1212-
x[subset, select, ...]
1212+
if (missing(subset)) {
1213+
x[, select, ...]
1214+
} else {
1215+
x[subset, select, ...]
1216+
}
12131217
})
12141218

12151219
#' Select

R/pkg/inst/tests/testthat/test_sparkSQL.R

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -799,6 +799,10 @@ test_that("subsetting", {
799799
expect_equal(count(df6), 1)
800800
expect_equal(columns(df6), c("name", "age"))
801801

802+
df7 <- subset(df, select = "name")
803+
expect_equal(count(df7), 3)
804+
expect_equal(columns(df7), c("name"))
805+
802806
# Test base::subset is working
803807
expect_equal(nrow(subset(airquality, Temp > 80, select = c(Ozone, Temp))), 68)
804808
})

0 commit comments

Comments
 (0)