Skip to content

Commit

Permalink
Merge branch 'master' of github.com:hadley/dplyr
Browse files Browse the repository at this point in the history
  • Loading branch information
hadley committed May 31, 2016
2 parents 74f3459 + 7385813 commit a1c4faf
Show file tree
Hide file tree
Showing 18 changed files with 567 additions and 138 deletions.
15 changes: 15 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Generated by roxygen2: do not edit by hand

S3method("[",fun_list)
S3method("[",grouped_df)
S3method(all.equal,tbl_df)
S3method(anti_join,data.frame)
Expand All @@ -13,6 +14,7 @@ S3method(as.data.frame,rowwise_df)
S3method(as.data.frame,tbl_cube)
S3method(as.data.frame,tbl_df)
S3method(as.data.frame,tbl_sql)
S3method(as.fun_list,"function")
S3method(as.fun_list,character)
S3method(as.fun_list,fun_list)
S3method(as.tbl,data.frame)
Expand Down Expand Up @@ -280,6 +282,7 @@ S3method(union_all,default)
S3method(union_all,tbl_lazy)
S3method(unique,sql)
export("%>%")
export(add_op_single)
export(add_row)
export(add_rownames)
export(all_equal)
Expand Down Expand Up @@ -397,13 +400,17 @@ export(memdb_frame)
export(min_rank)
export(mutate)
export(mutate_)
export(mutate_all)
export(mutate_at)
export(mutate_each)
export(mutate_each_)
export(mutate_each_q)
export(mutate_if)
export(n)
export(n_distinct)
export(n_groups)
export(na_if)
export(named_commas)
export(near)
export(nth)
export(ntile)
Expand Down Expand Up @@ -467,6 +474,7 @@ export(sql_subquery)
export(sql_translate_env)
export(sql_translator)
export(sql_variant)
export(sql_vector)
export(src)
export(src_desc)
export(src_df)
Expand All @@ -480,13 +488,19 @@ export(src_tbls)
export(starts_with)
export(summarise)
export(summarise_)
export(summarise_all)
export(summarise_at)
export(summarise_each)
export(summarise_each_)
export(summarise_each_q)
export(summarise_if)
export(summarize)
export(summarize_)
export(summarize_all)
export(summarize_at)
export(summarize_each)
export(summarize_each_)
export(summarize_if)
export(tally)
export(tbl)
export(tbl_cube)
Expand All @@ -507,6 +521,7 @@ export(type_sum)
export(ungroup)
export(union)
export(union_all)
export(vars)
export(with_order)
import(DBI)
import(assertthat)
Expand Down
17 changes: 15 additions & 2 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
* setdiff handles factors with NA (#1526).

* enabling joining of data frames that don't have the same encoding of
column names (#1513).
column names (#1513).

* `one_of()` tolerates unknown variables in `vars`, but warns (#1848, @jennybc).

## Breaking changes
Expand Down Expand Up @@ -69,6 +69,19 @@
* `union_all()` method. Maps to `UNION ALL` for SQL sources, `bind_rows()`
for data frames/tbl\_dfs, and `combine()` for vectors (#1045).

* A new family of functions replace `summarise_each()` and
`mutate_each()` (which will thus be deprecated in a future release).
`summarise_all()` and `mutate_all()` apply a function to all columns
while `summarise_at()` and `mutate_at()` operate on a subset of
columns. These columuns are selected with either a character vector
of columns names, a numeric vector of column positions, or a column
specification with `select()` semantics generated by the new
`columns()` helper. In addition, `summarise_if()` and `mutate_if()`
take a predicate function or a logical vector (these verbs currently
require local sources). All these functions can now take ordinary
functions instead of a list of functions generated by `funs()`
(though this is only useful for local sources). (#1845, @lionel-)

## Local backends

### dtplyr
Expand Down
Loading

0 comments on commit a1c4faf

Please sign in to comment.