Merge branch 'dev' into main

bschneidr · Sep 7, 2023 · 0abf420 · 0abf420
2 parents e8b8325 + b11668f
commit 0abf420
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,9 @@
 # svrep (development version)
 
+* Bug Fixes:
+
+  * In cases where the `variables` component of a survey design object is not a tibble, an unnecessary error message would appear when calling `as_data_frame_with_weights()` with only one name supplied to the `vars_to_keep` argument.
+
 * Changes specifically for CRAN check:
 
   * Removed 12 unmarked UTF-8 strings causing a CRAN check note.

diff --git a/R/as_data_frame_with_weights.R b/R/as_data_frame_with_weights.R
@@ -73,7 +73,7 @@ as_data_frame_with_weights <- function(design, full_wgt_name = "FULL_SAMPLE_WGT"
 
   if (!inherits(design, "DBIsvydesign")) {
     if (!is.null(vars_to_keep)) {
-      survey_data <- design[['variables']][,vars_to_keep]
+      survey_data <- design[['variables']][, vars_to_keep, drop = FALSE]
     } else {
       survey_data <- design[['variables']]
     }