Merge pull request #180 from DyfanJones/cran-2.6.1

Cran 2.6.1
DyfanJones · Dec 19, 2022 · 32317f3 · 32317f3
2 parents 6685081 + 6a29184
commit 32317f3
Show file tree

Hide file tree

Showing 87 changed files with 2,733 additions and 2,233 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: RAthena
 Type: Package
 Title: Connect to 'AWS Athena' using 'Boto3' ('DBI' Interface)
-Version: 2.6.0.9000
+Version: 2.6.1
 Authors@R: person("Dyfan", "Jones", email="[email protected]", 
                   role= c("aut", "cre"))
 Description: Designed to be compatible with the R package 'DBI' (Database Interface)

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,8 @@
+# RAthena 2.6.1
+## Bug Fix:
+* Prevent assuming role from `AWS_ROLE_ARN`. This caused confusing when connecting through web identity (#177)
+* Support `dbplyr::in_catalog` when working with `dplyr::tbl` (#178)
+
 # RAthena 2.6.0
 ## Bug Fix:
 *  Delay Python to R conversion to prevent 64 bit integer mapping to R's base 32 bit integer (#168) causing the follow bug in Data Scan info message. Thanks to @juhoautio for identifying issue.

diff --git a/R/Connection.R b/R/Connection.R
@@ -740,11 +740,12 @@ setMethod(
       # Get all s3 objects linked to table
       i <- 1
       kwargs <- list(Bucket = s3_path[["bucket"]], Prefix = s3_path[["key"]])
-      while (is.null(kwargs[["ContinuationToken"]])) {
+      token <- ""
+      while (!is.null(token)) {
+        kwargs[["ContinuationToken"]] <- (if (!nzchar(token)) NULL else token)
         objects <- py_to_r(do.call(conn@ptr$S3$list_objects_v2, kwargs))
         all_keys[[i]] <- lapply(objects$Contents, function(x) list(Key = x$Key))
-        if (identical(objects$NextContinuationToken, kwargs$ContinuationToken) || length(objects$NextContinuationToken) == 0) break
-        kwargs[["ContinuationToken"]] <- objects$NextContinuationToken
+        token <- objects$NextContinuationToken
         i <- i + 1
       }
       info_msg(