Fall back to regular subsetting.

`[[.tbl_df` now falls back to regular subsetting when used with anything other than a single string. Fixes #29
tidyverse · Mar 17, 2016 · 3d99995 · 3d99995
1 parent 6cfb350
commit 3d99995
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/R/tbl-df.r b/R/tbl-df.r
@@ -61,13 +61,13 @@ print.tbl_df <- function(x, ..., n = NULL, width = NULL) {
 
 #' @export
 `[[.tbl_df` <- function(x, i, exact = TRUE) {
-  if (is.character(i) && !(i %in% names(x)))
+  if (is.character(i) && length(i) == 1L && !(i %in% names(x)))
     stop("Unknown name", call. = FALSE)
   if (!exact) {
     warning("exact ignored", call. = FALSE)
   }
 
-  .subset2(x, i)
+  NextMethod()
 }
 
 #' @export

diff --git a/tests/testthat/test-tbl-df.r b/tests/testthat/test-tbl-df.r
@@ -38,3 +38,9 @@ test_that("[[.tbl_df ignores exact argument",{
   expect_warning(foo[["x", exact = FALSE]], "ignored")
   expect_identical(getElement(foo, "y"), 1:10)
 })
+
+test_that("can use recursive indexing with [[", {
+  foo <- data_frame(x = list(y = 1:3, z = 4:5))
+  expect_equal(foo[[c(1, 1)]], 1:3)
+  expect_equal(foo[[c("x", "y")]], 1:3)
+})