Always call SE version from functions.

Closes #564

NEWS.md

@@ -1,5 +1,8 @@
 # dplyr 0.2.0.99
 
+* Fix buglet in `select()` so that you can create variables called `val`. 
+  (#564).
+
 * New single table verb for selecting rows by position (#226).
 
 * Now instead of overriding `lag()`, dplyr overrides `lag.default()`, 

R/manip-cube.r

@@ -1,13 +1,13 @@
 #' @export
 select.tbl_cube <- function(.data, ...) {
-  vars <- select_vars(names(.data$mets), ..., env = parent.frame())
+  vars <- select_vars_q(names(.data$mets), dots(...), env = parent.frame())
   .data$mets <- .data$mets[vars]
   .data
 }
 
 #' @export
 rename.tbl_cube <- function(.data, ...) {
-  vars <- rename_vars(names(.data$mets), ..., env = parent.frame())
+  vars <- rename_vars_q(names(.data$mets), dots(...), env = parent.frame())
   .data$mets <- .data$mets[vars]
   .data
 }

R/manip-df.r

@@ -24,16 +24,15 @@ summarise.tbl_df <- .data_dots(summarise_impl, named_dots)
 
 #' @export
 select.grouped_df <- function(.data, ...) {
-  vars <- select_vars(names(.data), ..., env = parent.frame(),
+  vars <- select_vars_q(names(.data), dots(...), env = parent.frame(),
     include = as.character(groups(.data)))
 
   select_impl(.data, vars)
 }
 
 #' @export
 rename.grouped_df <- function(.data, ...) {
-  vars <- rename_vars(names(.data), ..., env = parent.frame(),
-    include = as.character(groups(.data)))
+  vars <- rename_vars_q(names(.data), dots(...), env = parent.frame())
 
   select_impl(.data, vars)
 }

R/manip-dt.r

@@ -122,7 +122,7 @@ arrange.tbl_dt <- function(.data, ...) {
 #' @rdname manip_dt
 #' @export
 select.data.table <- function(.data, ...) {
-  vars <- select_vars(names(.data), ..., env = parent.frame())
+  vars <- select_vars_q(names(.data), dots(...), env = parent.frame())
 
   out <- .data[, vars, drop = FALSE, with = FALSE]
   setnames(out, names(vars))
@@ -132,7 +132,7 @@ select.data.table <- function(.data, ...) {
 #' @rdname manip_dt
 #' @export
 rename.data.table <- function(.data, ...) {
-  vars <- rename_vars(names(.data), ..., env = parent.frame())
+  vars <- rename_vars_q(names(.data), dots(...), env = parent.frame())
 
   out <- .data[, vars, drop = FALSE, with = FALSE]
   setnames(out, names(vars))

R/manip-grouped-dt.r

@@ -117,7 +117,7 @@ arrange.grouped_dt <- function(.data, ...) {
 #' @rdname manip_grouped_dt
 #' @export
 select.grouped_dt <- function(.data, ...) {
-  vars <- select_vars(names(.data), ..., env = parent.frame(),
+  vars <- select_vars_q(names(.data), dots(...), env = parent.frame(),
     include = as.character(groups(.data)))
   out <- .data[, vars, drop = FALSE, with = FALSE]
   setnames(out, names(vars))
@@ -131,8 +131,7 @@ select.grouped_dt <- function(.data, ...) {
 #' @rdname manip_grouped_dt
 #' @export
 rename.grouped_dt <- function(.data, ...) {
-  vars <- rename_vars(names(.data), ..., env = parent.frame(),
-    include = as.character(groups(.data)))
+  vars <- rename_vars(names(.data), dots(...), env = parent.frame())
   out <- .data[, vars, drop = FALSE, with = FALSE]
   setnames(out, names(vars))
 

R/manip-sql.r

@@ -13,7 +13,7 @@ arrange.tbl_sql <- function(.data, ...) {
 
 #' @export
 select.tbl_sql <- function(.data, ...) {
-  vars <- select_vars(tbl_vars(.data), ..., env = parent.frame(),
+  vars <- select_vars_q(tbl_vars(.data), dots(...), env = parent.frame(),
     include = as.character(groups(.data)))
   # Index into variables so that select can be applied multiple times
   # and after a mutate.
@@ -26,8 +26,7 @@ select.tbl_sql <- function(.data, ...) {
 
 #' @export
 rename.tbl_sql <- function(.data, ...) {
-  vars <- rename_vars(tbl_vars(.data), ..., env = parent.frame(),
-    include = as.character(groups(.data)))
+  vars <- rename_vars_q(tbl_vars(.data), dots(...), env = parent.frame())
   # Index into variables so that select can be applied multiple times
   # and after a mutate.
   idx <- match(vars, tbl_vars(.data))

R/tbl-data-frame.R

@@ -46,12 +46,12 @@ arrange.data.frame <- function(.data, ...) {
 }
 #' @export
 select.data.frame <- function(.data, ...) {
-  vars <- select_vars(names(.data), ..., env = parent.frame())
+  vars <- select_vars_q(names(.data), dots(...), env = parent.frame())
   select_impl(.data, vars)
 }
 #' @export
 rename.data.frame <- function(.data, ...) {
-  vars <- rename_vars(names(.data), ..., env = parent.frame())
+  vars <- rename_vars_q(names(.data), dots(...), env = parent.frame())
   select_impl(.data, vars)
 }