Skip to content

Commit

Permalink
Merge pull request #16 from treasure-data/dplyr-100
Browse files Browse the repository at this point in the history
Support dplyr 1.0.0
  • Loading branch information
chezou committed Jun 1, 2020
2 parents 7f100cc + b94d984 commit b1e279b
Show file tree
Hide file tree
Showing 5 changed files with 51 additions and 10 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Expand Up @@ -28,7 +28,7 @@ Collate:
Imports:
readr (>= 1.2.1),
httr(>= 1.4.0),
dplyr (>= 0.7.8),
dplyr (>= 1.0.0),
jsonlite,
methods,
urltools,
Expand Down
4 changes: 4 additions & 0 deletions NEWS.md
@@ -1,3 +1,7 @@
# RTD 0.3.0

* Support dplyr 1.0.0

# RTD 0.2.0

* Fixed API key handling (#8)
Expand Down
2 changes: 1 addition & 1 deletion R/database.R
Expand Up @@ -14,7 +14,7 @@ NULL
#'
list_databases <- function(conn) {
res <- .get(conn, "/v3/database/list")
return(as.data.frame(do.call("rbind", res$databases)))
return(dplyr::tibble(as.data.frame(do.call("rbind", res$databases))))
}

#' Check table existence
Expand Down
2 changes: 1 addition & 1 deletion R/table.R
Expand Up @@ -38,7 +38,7 @@ exist_table <- function(conn, dbname, table) {
#'
list_tables <- function(conn, dbname) {
res <- .get(conn, paste0("/v3/table/list/", dbname))
return(as.data.frame(do.call("rbind", res$tables)))
return(dplyr::tibble(as.data.frame(do.call("rbind", res$tables))))
}


Expand Down
51 changes: 44 additions & 7 deletions RTD_example.html

Large diffs are not rendered by default.

0 comments on commit b1e279b

Please sign in to comment.