ensure new data reading is backwards compatible (#47)

jasp-stats · Oct 8, 2024 · 9fd59c5 · 9fd59c5
1 parent 8fbfa2a
commit 9fd59c5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/R/dataset.R b/R/dataset.R
@@ -59,7 +59,7 @@ preloadDataset <- function(datasetPathOrObject, options) {
 
   dataset <- convertToTypes(dataset[variables], types, datasetPathOrObject)
 
-  .setInternal("dataset", dataset)
+  .setInternal("preloadedDataset", dataset)
 
 }
 

diff --git a/R/options.R b/R/options.R
@@ -299,7 +299,10 @@ parsePreloadDataFromDescriptionQml <- function(analysisName) {
 
   preloadData <- isTRUE(description[["Description"]][["preloadData"]]) || isTRUE(description[[analysisName]][["preloadData"]])
   if (!preloadData)
-    warning("Analysis ", analysisName, " does not preload data. Please update the code.")
+    lifecycle::deprecate_warn(
+      when = "0.19.2",
+      what = I(sprintf("The analysis `%s` does not preload data. Please update inst/Description.qml, add `preloadData: true`, and fix any minor issues.", analysisName))
+    )
 
   return(preloadData)
 

diff --git a/R/rbridge.R b/R/rbridge.R
@@ -53,7 +53,7 @@
 }
 
 .readDataSetRequestedNative <- function() {
-  return(.getInternal("dataset"))
+  return(.getInternal("preloadedDataset"))
 }
 
 .requestTempFileNameNative <- function(...) {

diff --git a/R/run.R b/R/run.R
@@ -140,6 +140,7 @@ initAnalysisRuntime <- function(dataset, options, makeTests, ...) {
   reinstallChangedModules()
 
   # dataset to be found in the analysis when it needs to be read
+  .setInternal("dataset", dataset)
   preloadDataset(dataset, options)
 
   # prevent the results from being translated (unless the user explicitly wants to)
-Original file line number
+Diff line change
@@ Expand Up / @@ -59,7 +59,7 @@ preloadDataset <- function(datasetPathOrObject, options) { @@
       dataset <- convertToTypes(dataset[variables], types, datasetPathOrObject)
-      .setInternal("dataset", dataset)
+      .setInternal("preloadedDataset", dataset)
     }
@@ Expand Down @@