Merge pull request #25 from thewileylab/db_function_template_fix

Db function template fix

NEWS.md

@@ -1,3 +1,9 @@
+# ReviewR 2.3.7
+
+## Fixes
+* Fixes template issue with development function (#24)
+* Updated demo database
+
 # ReviewR 2.3.6
 
 ## Features

cran-comments.md

@@ -1,14 +1,11 @@
 
-## Resubmission 5
+## Update Summary
 
-This is the fifth resubmission of the 'ReviewR' package. In this version I have addressed the following identified issues:
+This is a minor update to the ReviewR package, bringing the version to  2.3.7
 
-* Documentation: 
-  * Remove @examples for unexported functions
-* Functions
-  * Remove `dev_add_google_client_id` function which assisted with placing a Google Client ID JSON file in a location accessible by ReviewR. Instead, allow a user to specify a path to a Google ClientID *already located* on their system. The BigQuery module will still check a few locations depending on the detected platform but users are no longer required to use these locations and may specify their own. None of this is necessary if users wish to use the Google ClientID built into this package. 
-* Misc
-  * Update version to 2.3.6
+Fixes
+  * Addresses an issue with a development function, intended to help developers extend the functionality of ReviewR.
+  * The demonstration database has been updated.
 
 ## Test environments
 
@@ -22,9 +19,7 @@ This is the fifth resubmission of the 'ReviewR' package. In this version I have
 ### R-hub
 
 * Windows Server 2008 R2 SP1, R-devel, 32/64 bit
-  * libcurl error code 35 returned for some vignettes URLs - I believe this to be an error as identified URLs are still active and pass the same checks on other platforms.
 * Ubuntu Linux 20.04.1 LTS, R-release, GCC
-  * PREPERROR, though overall r-hub build process appears to have succeeded. All R CMD checks appear to pass.
 * Fedora Linux, R-devel, clang, gfortran
 
 ### Win-builder

data-raw/templates/template_all_patients_table

@@ -1,19 +1,19 @@
-#' {new_datamodel} Tables
+#' {new_data_model} Tables
 #'
-#' Collection of functions to create pre-arranged views of {new_datamodel} patient data for ReviewR.
+#' Collection of functions to create pre-arranged views of {new_data_model} patient data for ReviewR.
 #' 
 #' @param table_map tibble containing a the cdm that most closely matches the user's database and a map of standard tables to user tables
 #' @param db_connection Connection info received from the database setup module
 #'
-#' @rdname {new_datamodel}_tables
+#' @rdname {new_data_model}_tables
 #' @keywords internal
 #' 
 #' @import dplyr
 #' @importFrom magrittr %>% 
 #' @importFrom rlang .data
 
-## {new_datamodel} All Patient Table ----
-{new_datamodel}_table_all_patients <- function(table_map, db_connection) {{
+## {new_data_model} All Patient Table ----
+{new_data_model}_table_all_patients <- function(table_map, db_connection) {{
   user_table(table_map, db_connection, '{all_patients_table}') %>% 
     rename(ID = user_field(table_map, '{all_patients_table}', '{patient_identifier_field}') ) %>%  
     collect()

data-raw/templates/template_subject_table

@@ -1,10 +1,10 @@
-## {new_datamodel} {new_table} Table ----
+## {new_data_model} {new_table} Table ----
 #' @param subject_id The selected subject 
 #'
-#' @rdname {new_datamodel}_tables
+#' @rdname {new_data_model}_tables
 #' @keywords internal
 #' 
-{new_datamodel}_table_{new_table} <- function(table_map, db_connection, subject_id) {{
+{new_data_model}_table_{new_table} <- function(table_map, db_connection, subject_id) {{
   subject <- as.integer(subject_id)
   user_table(table_map, db_connection, '{new_table}') %>% 
     filter(!!as.name(user_field(table_map, '{new_table}','{patient_identifier_field}')) == subject) %>%