diff --git a/DESCRIPTION b/DESCRIPTION index b319eb9c3e..5aac668d40 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: tiledb Type: Package -Version: 0.25.0.4 +Version: 0.25.0.5 Title: Modern Database Engine for Complex Data Based on Multi-Dimensional Arrays Authors@R: c(person("TileDB, Inc.", role = c("aut", "cph")), person("Dirk", "Eddelbuettel", email = "dirk@tiledb.com", role = "cre")) diff --git a/LICENSE b/LICENSE index 11707ac6da..993075a6a9 100644 --- a/LICENSE +++ b/LICENSE @@ -1,2 +1,2 @@ -YEAR: 2017-2021 +YEAR: 2017-2024 COPYRIGHT HOLDER: TileDB Inc. diff --git a/NEWS.md b/NEWS.md index c72591bf6d..a97e1e21f1 100644 --- a/NEWS.md +++ b/NEWS.md @@ -8,6 +8,10 @@ * The Arrow integration has been simplified using [nanoarrow](https://github.com/apache/arrow-nanoarrow) returning a single `nanoarrow` object; an unexported helper function `nanoarrow2list()` is provided to matching the previous interface (#682) +## Bug Fixes + +* The column headers now correspond to the column content in the two-column `data.frame` returns by `tiledb_object_walk` (#684 closing #683) + ## Build and Test Systems * The `configure` and `Makevars.in` received a minor update correcting small issues (#680) diff --git a/src/libtiledb.cpp b/src/libtiledb.cpp index d285f9c88c..1688ebc2ea 100644 --- a/src/libtiledb.cpp +++ b/src/libtiledb.cpp @@ -4324,8 +4324,8 @@ DataFrame libtiledb_object_walk(XPtr ctx, uris.push_back(object.uri()); types.push_back(_object_type_to_string(object.type())); } - return Rcpp::DataFrame::create(Rcpp::Named("TYPE") = uris, - Rcpp::Named("URI") = types); + return Rcpp::DataFrame::create(Rcpp::Named("TYPE") = types, + Rcpp::Named("URI") = uris); } /**