OHDSI · azimov · Sep 18, 2025 · Sep 18, 2025 · Sep 18, 2025 · Sep 19, 2025
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: ResultModelManager
 Title: Result Model Manager
-Version: 0.6.0
+Version: 0.6.0.9999
 Authors@R:
     person("Jamie", "Gilbert", , "gilbert@ohdsi.org", role = c("aut", "cre"))
 Description: Database data model management utilities for R packages in the Observational Health Data Sciences and

diff --git a/NEWS.md b/NEWS.md
@@ -7,6 +7,8 @@ forces errors if an input is not of an array of type int. `{TYPEC INT @cohort_id
 length 1. NA/NULL is automatically prevented whenever there is a type check.
 Default SQL render behaviour is not altered.
 
+2. Query Namespaces now support adding sql files as automatically mapped functions
+
 # ResultModelManager 0.6.0
 
 Changes:

diff --git a/R/QueryNamespace.R b/R/QueryNamespace.R
@@ -119,6 +119,7 @@
 #'
 QueryNamespace <- R6::R6Class(
   classname = "QueryNamespace",
+  lock_objects = FALSE,
   private = list(
     replacementVars = NULL,
     tableSpecifications = list(),
@@ -133,9 +134,15 @@ QueryNamespace <- R6::R6Class(
     #' @param connectionHandler  ConnectionHandler instance @seealso[ConnectionHandler]
     #' @param tableSpecification tableSpecification data.frame
     #' @param tablePrefix constant string to prefix all tables with
+    #' @param queryFiles vector of file paths to sql files that can be automatically loaded and translated as additional methods for this module
+    #' @param executeFiles vector of file paths to sql files that can be automatically loaded and translated as additional methods for this module. Queries will executed and not return a result
+    #' @param snakeCaseToCamelCaseFileNames - if true the method name will turn snake case file names in queryFiles in to camel case (e.g. my_query.sql becomes qns$myQuery)
     #' @param ... additional replacement variables e.g. database_schema, vocabulary_schema etc
-    initialize = function(connectionHandler = NULL, tableSpecification = NULL, tablePrefix = "", ...) {
+    initialize = function(connectionHandler = NULL, tableSpecification = NULL, tablePrefix = "", queryFiles = NULL, executeFiles = NULL, snakeCaseToCamelCaseFileNames = FALSE, ...) {
       checkmate::assertString(tablePrefix)
+      checkmate::assertCharacter(queryFiles, null.ok = TRUE)
+      checkmate::assertCharacter(executeFiles, null.ok = TRUE)
+
       self$tablePrefix <- tablePrefix
       private$replacementVars <- fastmap::fastmap()
       if (!is.null(connectionHandler)) {
@@ -153,9 +160,59 @@ QueryNamespace <- R6::R6Class(
         }
       }
 
+      lapply(queryFiles, self$addQueryFile, snakeCaseToCamelCaseFileNames = snakeCaseToCamelCaseFileNames)
+      lapply(executeFiles, self$addQueryFile, snakeCaseToCamelCaseFileNames = snakeCaseToCamelCaseFileNames, execFunction = TRUE)
+
       self
     },
 
+    #' Add query file
+    #' @description
+    #' Add an sql file query as a method to this namespace.
+    #' This allows you to run the query with any settings that are encapsulated within this object.
+    #' Package maintainers should take note that these functions will not be exposed and will include no validation
+    #' checks on user input. Use with care.
+    #' @param filepath  path to sql file - this will determine the name of the function
+    #' @param execFunction  default false - instead of returning a result, execute a query or set of queries
+    #' @param snakeCaseToCamelCaseFileNames - if true the method name will turn snake case names in to camel case (e.g. my_query.sql becomes qns$myQuery)
+    addQueryFile = function(filepath, snakeCaseToCamelCaseFileNames = FALSE, execFunction = FALSE) {
+      checkmate::assertFileExists(filepath)
+      # Ensure file has .sql extension
+      if (tolower(tools::file_ext(filepath)) != "sql") {
+        stop("File must have a .sql extension")
+      }
+
+      # Derive function name from file name
+      baseName <- basename(filepath)
+      functionName <- sub("\\.sql$", "", baseName)
+      if (snakeCaseToCamelCaseFileNames) {
+        # Convert snake_case to camelCase
+        functionName <- SqlRender::snakeCaseToCamelCase(functionName)
+      }
+
+      if (functionName %in% names(self)) {
+        stop(paste("Cannot add existing name", functionName, "to object"))
+      }
+
+      # Define the callback function that runs the query
+      callback <- function(...) {
+        sql <- SqlRender::readSql(filepath)
+        # Render SQL with replacement variables and any additional arguments
+        renderedSql <- self$render(sql, ...)
+        # Query the database and return results
+        if (execFunction){
+          return(self$executeSql(sql))
+        }
+
+        return(self$queryDb(renderedSql))
+      }
+
+      # Dynamically add the function as a method to this instance
+      self[[functionName]] <- callback
+
+      invisible(NULL)
+    },
+
     #' Set Connection Handler
     #' @description set connection handler object for object
     #' @param connectionHandler ConnectionHandler instance

diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html
diff --git a/docs/articles/CreatingMigrations.html b/docs/articles/CreatingMigrations.html
diff --git a/docs/articles/ExampleProject.html b/docs/articles/ExampleProject.html
diff --git a/docs/articles/PackageDesign.html b/docs/articles/PackageDesign.html
diff --git a/docs/articles/UploadFunctionality.html b/docs/articles/UploadFunctionality.html
diff --git a/docs/articles/UsingAnExportManager.html b/docs/articles/UsingAnExportManager.html
diff --git a/docs/articles/UsingConnectionHandlers.html b/docs/articles/UsingConnectionHandlers.html
diff --git a/docs/articles/UsingPythonUploads.html b/docs/articles/UsingPythonUploads.html
diff --git a/docs/articles/UsingQueryNamespaces.html b/docs/articles/UsingQueryNamespaces.html
diff --git a/docs/articles/index.html b/docs/articles/index.html
diff --git a/docs/authors.html b/docs/authors.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/news/index.html b/docs/news/index.html
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -10,7 +10,7 @@ articles:
   UsingConnectionHandlers: UsingConnectionHandlers.html
   UsingPythonUploads: UsingPythonUploads.html
   UsingQueryNamespaces: UsingQueryNamespaces.html
-last_built: 2025-09-18T14:52Z
+last_built: 2025-09-18T17:33Z
 urls:
   reference: https://ohdsi.github.io/ResultModelManager/reference
   article: https://ohdsi.github.io/ResultModelManager/articles