Fix 'tiledb_array_schema' enumeration mapping

Author: cgiachalis

R/ArraySchema.R

@@ -114,7 +114,22 @@ tiledb_array_schema <- function(
   )
   # if (allows_dups && !sparse) stop("'allows_dups' requires 'sparse' TRUE")
 
-  attr_ptr_list <- if (is.list(attrs)) lapply(attrs, function(obj) slot(obj, "ptr")) else list()
+  if (is.list(attrs)) {
+    attr_names <- sapply(attrs, name)
+    attr_ptr_list <- lapply(attrs, function(obj) slot(obj, "ptr"))
+    names(attr_ptr_list) <- attr_names
+
+    # Do not allow enum named list to have different names than attributes
+    if (!is.null(enumerations)) {
+      if (!all(names(enumerations) %in% attr_names)) {
+        stop("'enumerations' should be a named list mapped to attributes names")
+      }
+    }
+
+  } else {
+    attr_ptr_list <- list()
+  }
+
   coords_filter_list_ptr <- if (!is.null(coords_filter_list)) coords_filter_list@ptr else NULL
   offsets_filter_list_ptr <- if (!is.null(offsets_filter_list)) offsets_filter_list@ptr else NULL
   validity_filter_list_ptr <- if (!is.null(validity_filter_list)) validity_filter_list@ptr else NULL

src/libtiledb.cpp

@@ -1914,11 +1914,13 @@ XPtr<tiledb::ArraySchema> libtiledb_array_schema(
     for (R_xlen_t i = 0; i < nenum; i++) {
       bool nn = enumerations[i] == R_NilValue;
       if (nn == false) {
-        XPtr<tiledb::Attribute> attr =
-            as<XPtr<tiledb::Attribute>>(attributes[i]);
         std::vector<std::string> enums =
             as<std::vector<std::string>>(enumerations[i]);
         std::string enum_name = std::string(enumnames[i]);
+
+        XPtr<tiledb::Attribute> attr =
+            as<XPtr<tiledb::Attribute>>(attributes[enum_name]);
+
         bool is_ordered = false; // default
         // 'ordered' is an attribute off the CharacterVector
         CharacterVector enumvect = enumerations[i];