move extraction of used columns into interrogate

rstudio · Sep 12, 2024 · 7f30dc5 · 7f30dc5
1 parent 8287cc4
commit 7f30dc5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/R/col_vals_expr.R b/R/col_vals_expr.R
@@ -339,10 +339,6 @@ col_vals_expr <- function(
     }
   }
 
-  # Extract columns from expr
-  data_cols <- colnames(apply_preconditions_for_cols(x, preconditions))
-  columns <- all_data_vars(expr, data_cols)
-
   # Resolve segments into list
   segments_list <- 
     resolve_segments(
@@ -404,7 +400,7 @@ col_vals_expr <- function(
         assertion_type = "col_vals_expr",
         i_o = i_o,
         columns_expr = NA_character_,
-        column = columns,
+        column = NA_character_,
         values = expr,
         preconditions = preconditions,
         seg_expr = segments,

diff --git a/R/interrogate.R b/R/interrogate.R
@@ -311,6 +311,13 @@ interrogate <- function(
           assertion_type = assertion_type
         )
 
+      if (assertion_type == "col_vals_expr") {
+        # Extract columns from expr and update validation set with used columns
+        expr <- get_values_at_idx(agent = agent, idx = i)[[1]]
+        columns <- all_data_vars(expr, data_cols = colnames(table))
+        agent$validation_set[[i, "column"]] <- list(columns)
+      }
+
     } else if (assertion_type == "conjointly") {
 
       validation_formulas <- get_values_at_idx(agent = agent, idx = i)