Fix C++ tests

Author: XanthosXanthopoulos

libtiledbsoma/src/soma/managed_query.cc

@@ -628,7 +628,6 @@ void ManagedQuery::_cast_dictionary_values(ArrowSchema* schema, ArrowArray* arra
     // to the associated dictionary values and set the buffers to use the
     // dictionary values to write to disk. Note the specialized templates for
     // string and Boolean types below
-
     auto value_array = array->dictionary;
 
     T* valbuf;
@@ -637,21 +636,6 @@ void ManagedQuery::_cast_dictionary_values(ArrowSchema* schema, ArrowArray* arra
     } else {
         valbuf = (T*)value_array->buffers[1];
     }
-    // std::vector<T> values(valbuf, valbuf + value_array->length);
-
-    // std::vector<int64_t> indexes = _get_index_vector(schema, array);
-
-    // std::vector<T> index_to_value;
-    // for (auto i : indexes) {
-    //     index_to_value.push_back(values[i]);
-    // }
-
-    // setup_write_column(
-    //     schema->name,
-    //     array->length,
-    //     (const void*)index_to_value.data(),
-    //     (uint64_t*)nullptr,
-    //     std::nullopt);  // validities are set by index column
 
     std::span<const T> values(valbuf, value_array->length);
 

libtiledbsoma/src/soma/managed_query.h

@@ -676,8 +676,7 @@ class ManagedQuery {
             buf = (UserType*)array->buffers[1] + array->offset;
         }
 
-        bool has_attr = schema_->has_attribute(schema->name);
-        if (has_attr && attr_has_enum(schema->name)) {
+        if (schema_->has_attribute(schema->name) && attr_has_enum(schema->name)) {
             // For columns with dictionaries, we need to set the data buffers to
             // the dictionary's indexes. If there were any new enumeration
             // values added, we need to extend and and evolve the TileDB

libtiledbsoma/test/unit_soma_dataframe.cc

@@ -173,8 +173,8 @@ TEST_CASE_METHOD(VariouslyIndexedDataFrameFixture, "SOMADataFrame: basic", "[SOM
     {
         sdf = open(OpenMode::soma_read);
         auto mq = sdf->create_managed_query();
-        mq.setup_write_column(dim_infos[0].name, d0.size(), d0.data(), (uint64_t*)nullptr);
-        mq.setup_write_column(attr_infos[0].name, a0.size(), a0.data(), (uint64_t*)nullptr);
+        REQUIRE_THROWS(mq.setup_write_column(dim_infos[0].name, d0.size(), d0.data(), (uint64_t*)nullptr));
+        REQUIRE_THROWS(mq.setup_write_column(attr_infos[0].name, a0.size(), a0.data(), (uint64_t*)nullptr));
         REQUIRE_THROWS(mq.submit_write());
         sdf->close();
     }

libtiledbsoma/test/unit_soma_sparse_ndarray.cc

@@ -93,8 +93,8 @@ TEST_CASE("SOMASparseNDArray: basic", "[SOMASparseNDArray]") {
     {
         snda->open(OpenMode::soma_read);
         auto mq = snda->create_managed_query();
-        mq.setup_write_column(dim_name, d0.size(), d0.data(), (uint64_t*)nullptr);
-        mq.setup_write_column(attr_name, a0.size(), a0.data(), (uint64_t*)nullptr);
+        REQUIRE_THROWS(mq.setup_write_column(dim_name, d0.size(), d0.data(), (uint64_t*)nullptr));
+        REQUIRE_THROWS(mq.setup_write_column(attr_name, a0.size(), a0.data(), (uint64_t*)nullptr));
         REQUIRE_THROWS(mq.submit_write());
         snda->close();
     }