Try to work around tidyverse/dplyr#4062 and tidyverse/dbplyr#197

WinVector · Dec 31, 2018 · a53c450 · a53c450
1 parent e5eeb31
commit a53c450
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: replyr
 Type: Package
 Title: Patches to Use 'dplyr' on Remote Data Sources
-Version: 0.9.8
-Date: 2018-09-18
+Version: 0.9.9
+Date: 2018-12-31
 Authors@R: c(
     person("John", "Mount", email = "jmount@win-vector.com", role = c("aut", "cre")),
     person("Nina", "Zumel", email = "nzumel@win-vector.com", role = c("aut")),
@@ -27,7 +27,7 @@ Imports:
   dplyr (>= 0.7.0),
   rlang (>= 0.2.0),
   DBI
-RoxygenNote: 6.1.0
+RoxygenNote: 6.1.1
 Suggests: testthat,
     knitr,
     rmarkdown,

diff --git a/NAMESPACE b/NAMESPACE
@@ -60,6 +60,7 @@ importFrom(dplyr,funs)
 importFrom(dplyr,inner_join)
 importFrom(dplyr,left_join)
 importFrom(dplyr,mutate)
+importFrom(dplyr,n)
 importFrom(dplyr,summarise_all)
 importFrom(dplyr,summarize)
 importFrom(dplyr,tbl)

diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,8 @@
 
+# replyr 0.9.9 2018-12-31
+
+ * Work around https://github.com/tidyverse/dplyr/issues/4062 .
+
 # replyr 0.9.8 2018-09-18
 
  * Force parent.frame.

diff --git a/R/joinController.R b/R/joinController.R
@@ -1,5 +1,8 @@
 
 
+#' @importFrom dplyr n
+NULL
+
 getConcreteTableName <- function(handle) {
   # TODO: get a safe way to get the concrete name
   #  https://github.com/tidyverse/dplyr/issues/2824
@@ -299,7 +302,6 @@ tableDescription <- function(tableName,
 #' @export
 #'
 keysAreUnique <- function(tDesc) {
-  n <- dplyr::n # declare not  unbound
   isunique <- vapply(seq_len(replyr_nrow(tDesc)),
                      function(i) {
                        gi <- tDesc$handle[[i]]
@@ -750,7 +752,6 @@ inspectDescrAndJoinPlan <- function(tDesc, columnJoinPlan,
 buildJoinPlan <- function(tDesc,
                           ...,
                           check= TRUE) {
-  n <- dplyr::n # declare not an unbound ref
   count <- NULL # declare not an unbound ref
   ntab <- replyr_nrow(tDesc)
   if(length(unique(tDesc$tableName))!=ntab) {