Merge pull request openedx#142 from saraburns1/upgrade_reqs

chore: Update package versions

macros/cluster_macros.sql

@@ -1,15 +1,13 @@
 -- Return an ON CLUSTER clause if we are running dbt against a cluster
 {% macro on_cluster() -%}
     {%- if env_var("CLICKHOUSE_CLUSTER_NAME", "") != "" -%}
-    ON CLUSTER "{{ env_var("CLICKHOUSE_CLUSTER_NAME") }}"
-  {%- endif -%}
+        {on CLUSTER "{{ env_var(" CLICKHOUSE_CLUSTER_NAME ") }}"}
+    {%- endif -%}
 {%- endmacro %}
 
 -- Return a version of the given table engine suitable for use on ClickHouse clusters
 {% macro get_engine(engine) -%}
-  {%- if env_var("CLICKHOUSE_CLUSTER_NAME", "") != "" -%}
-    {{ "Replicated" + engine }}
-  {% else %}
-    {{ engine }}
-  {%- endif -%}
+    {%- if env_var("CLICKHOUSE_CLUSTER_NAME", "") != "" -%} {{ "Replicated" + engine }}
+    {% else %} {{ engine }}
+    {%- endif -%}
 {%- endmacro %}

models/instance/schema.yml

@@ -52,7 +52,7 @@ models:
         data_tests:
           - accepted_values_xapi:
               values: [ "registered", "unregistered" ]
-              table: 'xapi.fact_instance_enrollments'
+              table: 'fact_instance_enrollments'
       - name: course_enrollment_mode_status_cnt
         data_type: Int
         description: "The number of enrollment events for this mode that occurred in the given hour"

models/navigation/schema.yml

@@ -253,7 +253,7 @@ models:
                 - 'No pages viewed yet'
                 - 'All pages viewed'
                 - 'At least one page viewed'
-              table: 'xapi.section_page_engagement'
+              table: 'section_page_engagement'
 
   - name: subsection_page_engagement
     description: "A record per course per subsection per learner with their engagement level"
@@ -279,4 +279,4 @@ models:
                 - 'No pages viewed yet'
                 - 'All pages viewed'
                 - 'At least one page viewed'
-              table: 'xapi.subsection_page_engagement'
+              table: 'subsection_page_engagement'

models/problems/schema.yml

@@ -283,7 +283,7 @@ models:
                 - 'No problems attempted yet'
                 - 'All problems attempted'
                 - 'At least one problem attempted'
-              table: 'xapi.section_problem_engagement'
+              table: 'section_problem_engagement'
 
   - name: subsection_problem_engagement
     description: "A record per course per subsection per learner with their engagement level"
@@ -309,4 +309,4 @@ models:
                 - 'No problems attempted yet'
                 - 'All problems attempted'
                 - 'At least one problem attempted'
-              table: 'xapi.subsection_problem_engagement'
+              table: 'subsection_problem_engagement'

models/video/schema.yml

@@ -210,7 +210,7 @@ models:
                 - 'No videos viewed yet'
                 - 'All videos viewed'
                 - 'At least one video viewed'
-              table: 'xapi.section_video_engagement'
+              table: 'section_video_engagement'
 
   - name: subsection_video_engagement
     description: "A record per course per subsection per learner with their engagement level"
@@ -236,7 +236,7 @@ models:
                 - 'No videos viewed yet'
                 - 'All videos viewed'
                 - 'At least one video viewed'
-              table: 'xapi.subsection_video_engagement'
+              table: 'subsection_video_engagement'
 
   - name: watched_video_duration
     description: "Amount of time in seconds watched by each actor for every video"

package-lock.yml

@@ -1,6 +1,6 @@
 packages:
   - package: dbt-labs/codegen
-    version: 0.12.1
+    version: 0.13.1
   - package: dbt-labs/dbt_utils
-    version: 1.1.1
-sha1_hash: d974113b0f072cce35300077208f38581075ab40
+    version: 1.3.0
+sha1_hash: 9c459bb513316be11ab55af0e5113f17444d082e

packages.yml

@@ -1,5 +1,5 @@
 packages:
   - package: dbt-labs/codegen
-    version: 0.12.1
+    version: 0.13.1
   - package: dbt-labs/dbt_utils
-    version: 1.1.1
+    version: 1.3.0

requirements.txt

@@ -1,5 +1,5 @@
-dbt-clickhouse==1.8.1
+dbt-clickhouse==1.8.7
 dbt-core~=1.8.0
-shandy-sqlfmt[jinjafmt]==0.21.2
+shandy-sqlfmt[jinjafmt]==0.26.0
 dbt-coverage
 clickhouse-cityhash