Don't convert all-caps field names to camelCase

Fixes #62
AtlasOfLivingAustralia · Jul 20, 2021 · eeae3eb · eeae3eb
1 parent bf449d1
commit eeae3eb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/R/utilities_internal.R b/R/utilities_internal.R
@@ -51,8 +51,11 @@ rename_columns <- function(varnames, type) {
     } else if (type == "occurrence") {
       # change dots to camel case
       varnames <- gsub("\\.(\\w?)", "\\U\\1", varnames, perl = TRUE)
-      # replace first letters with lowercase
-      substr(varnames, 1, 1) <- tolower(substr(varnames, 1, 1))
+      # replace first letters with lowercase, but only if it is not an
+      # all-uppercase field name (which assertions are)
+      not_all_uppercase <- str_detect(varnames, "[[:lower:]]")
+      substr(varnames[not_all_uppercase], 1, 1) <-
+        tolower(substr(varnames[not_all_uppercase], 1, 1))
     }
     varnames
 }

diff --git a/tests/testthat/test-ala_occurrences.R b/tests/testthat/test-ala_occurrences.R
@@ -71,7 +71,7 @@ test_that("ala occurrences returns requested columns", {
 
 test_that("ala occurrences handles assertion columns and works with data.frame
           input", {
-  skip("qa field ignored by ALA")
+  skip_on_cran()
   id <- select_taxa("Paraparatrechina minutula")
   cols <- select_columns("ZERO_COORDINATE", "eventDate")
   expect_equal(names(ala_occurrences(taxa = id, columns = cols)),