Merge branch 'release/3.9.0'

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: tarflow.iquizoo
 Title: Setup "targets" Workflows for "iquizoo" Data Processing
-Version: 3.8.2
+Version: 3.9.0
 Authors@R: c(
     person("Liang", "Zhang", , "[email protected]", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0001-9041-1150")),
@@ -22,23 +22,20 @@ Imports:
     data.iquizoo (>= 2023.10.22),
     DBI,
     dplyr,
-    jsonlite,
     memoise,
     purrr,
     rlang (>= 1.0.0),
     stringr,
     tarchetypes,
     targets,
-    tidyr,
-    utils,
-    vctrs
+    tidyr
 Suggests:
     bit64,
     covr,
     digest,
     lifecycle,
     odbc,
-    preproc.iquizoo (>= 2.4.0),
+    preproc.iquizoo (>= 2.6.0),
     RMariaDB (>= 1.3.1),
     roxygen2,
     testthat (>= 3.0.0),

NAMESPACE

@@ -3,13 +3,11 @@
 export(check_source)
 export(fetch_data)
 export(fetch_iquizoo)
-export(preproc_data)
 export(setup_option_file)
 export(setup_source)
 export(setup_templates)
 export(tar_prep_iquizoo)
 export(use_targets_pipeline)
-export(wrangle_data)
 import(dplyr)
 import(rlang)
 import(tidyr)

NEWS.md

@@ -1,3 +1,10 @@
+# tarflow.iquizoo 3.9.0
+
+## Breaking Changes
+
+* Ensure all internal SQL query templates end with semicolon. This will unavoidably invalidate existing targets for old pipelines.
+* Removed `preproc_data()` and `wrangle_data()` functions. Now all data preprocessing are done in `preproc.iquizoo` package.
+
 # tarflow.iquizoo 3.8.2
 
 ## Enhancements

R/targets.R

@@ -230,7 +230,7 @@ tar_action_raw_data <- function(contents,
         targets::tar_target_raw(
           name_parsed,
           expr(wrangle_data(tar_data)),
-          packages = "tarflow.iquizoo"
+          packages = "preproc.iquizoo"
         )
       )
     },
@@ -251,7 +251,7 @@ tar_action_raw_data <- function(contents,
               .input = input, .extra = extra
             )
           ),
-          packages = c("tarflow.iquizoo", "preproc.iquizoo")
+          packages = "preproc.iquizoo"
         )
       )
     }
@@ -266,6 +266,7 @@ utils::globalVariables(
   c(
     "progress_hash", "project_id", "game_id",
     "tar_data", "tar_parsed",
+    "wrangle_data", "preproc_data",
     "prep_fun", "input", "extra"
   )
 )

_pkgdown.yml

@@ -7,13 +7,6 @@ reference:
   contents:
   - use_targets_pipeline
   - tar_prep_iquizoo
-- title: "Functions Used for Actions on Raw-data"
-  desc: >
-    Data parsing and pre-processing. Typically used in combination with
-    [preproc.iquizoo](https://psychelzh.github.io/preproc.iquizoo/) package.
-  contents:
-  - wrangle_data
-  - preproc_data
 - title: "Low-level Database operations"
   desc: Functions to help you interact with database.
   contents:

inst/sql/contents.sql

@@ -15,4 +15,4 @@ FROM
     INNER JOIN iquizoo_content_db.course_child_config ccc ON ccc.ChildCourseId = cc.Id AND ccc.Deleted <> 1
     INNER JOIN iquizoo_content_db.content c2 ON c2.Id = ccc.ContentId AND c2.ContentType <> 4 AND c2.Deleted <> 1
     INNER JOIN iquizoo_user_db.base_organization bo ON bo.Id = pcc.OrganizationId AND bo.Deleted <> 1
-WHERE bo.Name = ? AND pcc.Name = IFNULL(?, pcc.Name)
+WHERE bo.Name = ? AND pcc.Name = IFNULL(?, pcc.Name);

inst/sql/raw_data.sql

@@ -9,4 +9,4 @@ SELECT
 FROM
     iquizoo_business_db.{ table_name }
 WHERE
-    ProjectCourseConfigId = ? AND ContentId = ?
+    ProjectCourseConfigId = ? AND ContentId = ?;

inst/sql/scores.sql

@@ -12,4 +12,4 @@ SELECT
 FROM
     iquizoo_business_db.{ table_name }
 WHERE
-    ProjectCourseConfigId = ? AND ContentId = ?
+    ProjectCourseConfigId = ? AND ContentId = ?;