handle #2568 for real

tidyverse · Oct 1, 2018 · b742116 · b742116
1 parent ce3262c
commit b742116
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 34 deletions.
diff --git a/inst/include/dplyr/visitors/subset/DataFrameSubsetVisitors.h b/inst/include/dplyr/visitors/subset/DataFrameSubsetVisitors.h
@@ -2,7 +2,6 @@
 #define DPLY_VISITORS_SUBSET_DataFrameSubsetVisitors_H
 
 #include <tools/utils.h>
-#include <tools/is_lubridate_unsupported.h>
 #include <tools/bad.h>
 #include <dplyr/visitors/subset/column_subset.h>
 

diff --git a/inst/include/dplyr/visitors/subset/column_subset.h b/inst/include/dplyr/visitors/subset/column_subset.h
@@ -3,7 +3,6 @@
 
 #include <tools/utils.h>
 #include <tools/set_rownames.h>
-#include <tools/is_lubridate_unsupported.h>
 #include <tools/bad.h>
 #include <tools/default_value.h>
 #include <tools/SlicingIndex.h>
@@ -135,10 +134,6 @@ SEXP column_subset(SEXP x, const Index& index, SEXP env) {
     return r_column_subset(x, index, env);
   }
 
-  if (is_lubridate_unsupported(x)) {
-    stop("classes Period and Interval from lubridate are currently not supported.") ;
-  }
-
   switch (TYPEOF(x)) {
   case LGLSXP:
     return column_subset_impl<LGLSXP, Index>(x, index);

diff --git a/inst/include/tools/is_lubridate_unsupported.h b/inst/include/tools/is_lubridate_unsupported.h
diff --git a/tests/testthat/test-distinct.R b/tests/testthat/test-distinct.R
@@ -167,24 +167,20 @@ test_that("distinct on a dataframe or tibble with columns of type list throws an
   )
 })
 
-test_that("distinct refuses to deal with Period and Interval from lubridate (#2568)", {
-  skip("no need for this anymore")
-  # skip_if_not(requireNamespace("lubridate", quietly = TRUE))
+test_that("distinct deals with Period and Interval from lubridate (#2568)", {
+  skip_if_not(requireNamespace("lubridate", quietly = TRUE))
 
   df <- tibble(
     x = lubridate::hm("10:30", "10:30", "0:0"),
     y = c("apple", "apple", "tomato")
   )
-  expect_error(distinct(df),
-    "classes Period and Interval from lubridate are currently not supported"
-  )
+  res <- distinct(df)
+  expect_equal(res, df[c(1, 3), ])
 
   df <- tibble(
     lubridate::interval(lubridate::ymd(20090201), lubridate::ymd(20090101))
   )
-  expect_error(distinct(df),
-    "classes Period and Interval from lubridate are currently not supported"
-  )
+  expect_equal(df, distinct(df))
 })
 
 test_that("distinct handles 0 columns edge case (#2954)", {