Merge pull request #703 from openedx/cag/fix-schema

fix: set correct schema for all datasets
openedx · Apr 9, 2024 · f76cfb4 · f76cfb4
2 parents 4994011 + 94cf24f
commit f76cfb4
Show file tree

Hide file tree

Showing 30 changed files with 33 additions and 33 deletions.
diff --git a/...ects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/ab_user.yaml b/...ects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/ab_user.yaml
@@ -190,8 +190,8 @@ metrics:
 normalize_columns: false
 offset: 0
 params: null
-schema: superset
-sql: select * from superset.ab_user
+schema: {{ SUPERSET_DB_NAME }}
+sql: select * from ab_user
 table_name: ab_user
 template_params: null
 uuid: 304a5d6d-c589-483a-8e8d-3fadbccef648

diff --git a/...emplates/aspects/build/aspects-superset/openedx-assets/assets/datasets/course_blocks.yaml b/...emplates/aspects/build/aspects-superset/openedx-assets/assets/datasets/course_blocks.yaml
@@ -127,7 +127,7 @@ metrics:
   warning_text: null
 offset: 0
 params: null
-schema: main
+schema: {{ASPECTS_EVENT_SINK_DATABASE}}
 sql: "select * from {{ASPECTS_EVENT_SINK_DATABASE}}.{{ ASPECTS_EVENT_SINK_NODES_TABLE }}"
 table_name: "{{ ASPECTS_EVENT_SINK_NODES_TABLE }}"
 template_params: null

diff --git a/...templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/course_names.yaml b/...templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/course_names.yaml
@@ -70,7 +70,7 @@ metrics:
 normalize_columns: true
 offset: 0
 params: null
-schema: main
+schema: {{ASPECTS_EVENT_SINK_DATABASE}}
 sql: select * from {{ ASPECTS_EVENT_SINK_DATABASE }}.course_names
 table_name: course_names
 template_params: null

diff --git a/...lates/aspects/build/aspects-superset/openedx-assets/assets/datasets/course_overviews.yaml b/...lates/aspects/build/aspects-superset/openedx-assets/assets/datasets/course_overviews.yaml
@@ -177,7 +177,7 @@ metrics:
 normalize_columns: true
 offset: 0
 params: null
-schema: main
+schema: {{ ASPECTS_EVENT_SINK_DATABASE }}
 sql: select * from {{ ASPECTS_EVENT_SINK_DATABASE }}.course_overviews
 table_name: course_overviews
 template_params: null

diff --git a/...s/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/dashboards.yaml b/...s/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/dashboards.yaml
@@ -226,7 +226,7 @@ metrics:
 normalize_columns: true
 offset: 0
 params: null
-schema: superset
+schema: {{ SUPERSET_DB_NAME }}
 sql: 'select * from dashboards'
 table_name: dashboards
 template_params: null

diff --git a/...es/aspects/build/aspects-superset/openedx-assets/assets/datasets/dim_course_problems.yaml b/...es/aspects/build/aspects-superset/openedx-assets/assets/datasets/dim_course_problems.yaml
@@ -106,7 +106,7 @@ metrics:
 normalize_columns: true
 offset: 0
 params: null
-schema: main
+schema: {{ DBT_PROFILE_TARGET_DATABASE }}
 sql: |-
   {% filter indent(width=2) %}{% include 'openedx-assets/queries/dim_course_problems.sql' %}{% endfilter %}
 table_name: dim_course_problems

diff --git a/...ates/aspects/build/aspects-superset/openedx-assets/assets/datasets/dim_course_videos.yaml b/...ates/aspects/build/aspects-superset/openedx-assets/assets/datasets/dim_course_videos.yaml
@@ -106,7 +106,7 @@ metrics:
 normalize_columns: true
 offset: 0
 params: null
-schema: main
+schema: {{ DBT_PROFILE_TARGET_DATABASE }}
 sql: |-
   {% filter indent(width=2) %}{% include 'openedx-assets/queries/dim_course_videos.sql' %}{% endfilter %}
 table_name: dim_course_videos

diff --git a/...tes/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_course_grades.yaml b/...tes/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_course_grades.yaml
@@ -151,7 +151,7 @@ metrics:
 normalize_columns: true
 offset: 0
 params: null
-schema: main
+schema: {{ DBT_PROFILE_TARGET_DATABASE }}
 sql: |-
   {% filter indent(width=2) %}{% include 'openedx-assets/queries/fact_course_grades.sql' %}{% endfilter %}
 table_name: fact_course_grades

diff --git a/...lates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_enrollments.yaml b/...lates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_enrollments.yaml
@@ -118,7 +118,7 @@ metrics:
 normalize_columns: true
 offset: 0
 params: null
-schema: main
+schema: {{ DBT_PROFILE_TARGET_DATABASE }}
 sql: |-
   {% filter indent(width=2) %}{% include 'openedx-assets/queries/fact_enrollments.sql' %}{% endfilter %}
 table_name: fact_enrollments

diff --git a/...spects/build/aspects-superset/openedx-assets/assets/datasets/fact_enrollments_by_day.yaml b/...spects/build/aspects-superset/openedx-assets/assets/datasets/fact_enrollments_by_day.yaml
@@ -118,7 +118,7 @@ metrics:
 normalize_columns: true
 offset: 0
 params: null
-schema: main
+schema: {{ DBT_PROFILE_TARGET_DATABASE }}
 sql: |-
   {% filter indent(width=2) %}{% include 'openedx-assets/queries/fact_enrollments_by_day.sql' %}{% endfilter %}
 table_name: fact_enrollments_by_day

diff --git a/...spects/build/aspects-superset/openedx-assets/assets/datasets/fact_forum_interactions.yaml b/...spects/build/aspects-superset/openedx-assets/assets/datasets/fact_forum_interactions.yaml
@@ -130,7 +130,7 @@ metrics:
 normalize_columns: true
 offset: 0
 params: null
-schema: main
+schema: {{ DBT_PROFILE_TARGET_DATABASE }}
 sql: |-
   {% filter indent(width=2) %}{% include 'openedx-assets/queries/fact_forum_interactions.sql' %}{% endfilter %}
 table_name: fact_forum_interactions

diff --git a/.../aspects-superset/openedx-assets/assets/datasets/fact_learner_problem_course_summary.yaml b/.../aspects-superset/openedx-assets/assets/datasets/fact_learner_problem_course_summary.yaml
@@ -154,7 +154,7 @@ metrics:
 normalize_columns: true
 offset: 0
 params: null
-schema: main
+schema: {{ DBT_PROFILE_TARGET_DATABASE }}
 sql: |-
   {% filter indent(width=2) %}{% include 'openedx-assets/queries/fact_learner_problem_course_summary.sql' %}{% endfilter %}
 table_name: fact_learner_problem_course_summary

diff --git a/...s/build/aspects-superset/openedx-assets/assets/datasets/fact_learner_problem_summary.yaml b/...s/build/aspects-superset/openedx-assets/assets/datasets/fact_learner_problem_summary.yaml
@@ -163,7 +163,7 @@ metrics:
 normalize_columns: true
 offset: 0
 params: null
-schema: main
+schema: {{ DBT_PROFILE_TARGET_DATABASE }}
 sql: |-
   {% filter indent(width=2) %}{% include 'openedx-assets/queries/fact_learner_problem_summary.sql' %}{% endfilter %}
 table_name: fact_learner_problem_summary

diff --git a/...pects/build/aspects-superset/openedx-assets/assets/datasets/fact_pageview_engagement.yaml b/...pects/build/aspects-superset/openedx-assets/assets/datasets/fact_pageview_engagement.yaml
@@ -106,7 +106,7 @@ metrics:
 normalize_columns: true
 offset: 0
 params: null
-schema: main
+schema: {{ DBT_PROFILE_TARGET_DATABASE }}
 sql: |-
   {% filter indent(width=2) %}{% include 'openedx-assets/queries/fact_pageview_engagement.sql' %}{% endfilter %}
 table_name: fact_pageview_engagement

diff --git a/...es/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_problem_grades.yaml b/...es/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_problem_grades.yaml
@@ -163,7 +163,7 @@ metrics:
 normalize_columns: true
 offset: 0
 params: null
-schema: main
+schema: {{ DBT_PROFILE_TARGET_DATABASE }}
 sql: |-
   {% filter indent(width=2) %}{% include 'openedx-assets/queries/fact_problem_grades.sql' %}{% endfilter %}
 table_name: fact_problem_grades

diff --git a/...aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_problem_responses.yaml b/...aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_problem_responses.yaml
@@ -175,7 +175,7 @@ metrics:
 normalize_columns: true
 offset: 0
 params: null
-schema: main
+schema: {{ DBT_PROFILE_TARGET_DATABASE }}
 sql: |-
   {% filter indent(width=2) %}{% include 'openedx-assets/queries/fact_problem_responses.sql' %}{% endfilter %}
 table_name: fact_problem_responses

diff --git a/.../aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_transcript_usage.yaml b/.../aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_transcript_usage.yaml
@@ -138,7 +138,7 @@ metrics:
 normalize_columns: true
 offset: 0
 params: null
-schema: main
+schema: {{ DBT_PROFILE_TARGET_DATABASE }}
 sql: |-
   {% filter indent(width=2) %}{% include 'openedx-assets/queries/fact_transcript_usage.sql' %}{% endfilter %}
 table_name: fact_transcript_usage

diff --git a/.../aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_video_engagement.yaml b/.../aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_video_engagement.yaml
@@ -106,7 +106,7 @@ metrics:
 normalize_columns: true
 offset: 0
 params: null
-schema: main
+schema: {{ DBT_PROFILE_TARGET_DATABASE }}
 sql: |-
   {% filter indent(width=2) %}{% include 'openedx-assets/queries/fact_video_engagement.sql' %}{% endfilter %}
 table_name: fact_video_engagement

diff --git a/...lates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_video_plays.yaml b/...lates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_video_plays.yaml
@@ -199,7 +199,7 @@ metrics:
 normalize_columns: true
 offset: 0
 params: null
-schema: main
+schema: {{ DBT_PROFILE_TARGET_DATABASE }}
 sql: |-
   {% filter indent(width=2) %}{% include 'openedx-assets/queries/fact_video_plays.sql' %}{% endfilter %}
 table_name: fact_video_plays

diff --git a/...ts/build/aspects-superset/openedx-assets/assets/datasets/fact_watched_video_segments.yaml b/...ts/build/aspects-superset/openedx-assets/assets/datasets/fact_watched_video_segments.yaml
@@ -149,7 +149,7 @@ metrics:
 normalize_columns: true
 offset: 0
 params: null
-schema: main
+schema: {{ DBT_PROFILE_TARGET_DATABASE }}
 sql: |-
   {% filter indent(width=2) %}{% include 'openedx-assets/queries/fact_watched_video_segments.sql' %}{% endfilter %}
 table_name: fact_watched_video_segments

diff --git a/...ates/aspects/build/aspects-superset/openedx-assets/assets/datasets/hints_per_success.yaml b/...ates/aspects/build/aspects-superset/openedx-assets/assets/datasets/hints_per_success.yaml
@@ -127,7 +127,7 @@ metrics:
 normalize_columns: true
 offset: 0
 params: null
-schema: main
+schema: {{ DBT_PROFILE_TARGET_DATABASE }}
 sql: |-
   {% filter indent(width=2) %}{% include 'openedx-assets/queries/hints_per_success.sql' %}{% endfilter %}
 table_name: hints_per_success

diff --git a/...mplates/aspects/build/aspects-superset/openedx-assets/assets/datasets/indexed_events.yaml b/...mplates/aspects/build/aspects-superset/openedx-assets/assets/datasets/indexed_events.yaml
@@ -129,7 +129,7 @@ metrics:
 normalize_columns: false
 offset: 0
 params: null
-schema: main
+schema: {{ ASPECTS_XAPI_DATABASE }}
 sql: |-
   {% filter indent(width=2) %}{% include 'openedx-assets/queries/indexed_events.sql' %}{% endfilter %}
 table_name: indexed_events

diff --git a/...mplates/aspects/build/aspects-superset/openedx-assets/assets/datasets/posts_per_user.yaml b/...mplates/aspects/build/aspects-superset/openedx-assets/assets/datasets/posts_per_user.yaml
@@ -103,7 +103,7 @@ metrics:
 normalize_columns: true
 offset: 0
 params: null
-schema: main
+schema: {{ DBT_PROFILE_TARGET_DATABASE }}
 sql: |-
   {% filter indent(width=2) %}{% include 'openedx-assets/queries/posts_per_user.sql' %}{% endfilter %}
 table_name: posts_per_user

diff --git a/...ts/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/query_log.yaml b/...ts/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/query_log.yaml
@@ -106,7 +106,7 @@ metrics:
 normalize_columns: false
 offset: 0
 params: null
-schema: main
+schema: system
 sql: |
   SELECT
       query_duration_ms,

diff --git a/...pects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/slices.yaml b/...pects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/slices.yaml
@@ -273,8 +273,8 @@ metrics:
 normalize_columns: true
 offset: 0
 params: null
-schema: superset
-sql: select * from superset.slices
+schema: {{ SUPERSET_DB_NAME }}
+sql: select * from slices
 table_name: slices
 template_params: null
 uuid: aaf1ae12-73c1-4b88-b07d-7a8988333018

diff --git a/...cts/build/aspects-superset/openedx-assets/assets/datasets/slowest_clickhouse_queries.yaml b/...cts/build/aspects-superset/openedx-assets/assets/datasets/slowest_clickhouse_queries.yaml
@@ -81,7 +81,7 @@ metrics:
 normalize_columns: false
 offset: 0
 params: null
-schema: main
+schema: system
 sql: |-
   {% filter indent(width=2) %}{% include 'openedx-assets/queries/slowest_clickhouse_queries.sql' %}{% endfilter %}
 table_name: slowest_clickhouse_queries

diff --git a/...es/aspects/build/aspects-superset/openedx-assets/assets/datasets/superset_action_log.yaml b/...es/aspects/build/aspects-superset/openedx-assets/assets/datasets/superset_action_log.yaml
@@ -190,7 +190,7 @@ metrics:
 normalize_columns: false
 offset: 0
 params: null
-schema: superset
+schema: {{ SUPERSET_DB_NAME }}
 sql: |-
   {% filter indent(width=2) %}{% include 'openedx-assets/queries/superset_action_log.sql' %}{% endfilter %}
 table_name: superset_action_log

diff --git a/...cts/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/user_pii.yaml b/...cts/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/user_pii.yaml
@@ -5,8 +5,8 @@ description: null
 default_endpoint: null
 offset: 0
 cache_timeout: null
-schema: main
-sql: 'select * from event_sink.user_pii'
+schema: {{ ASPECTS_EVENT_SINK_DATABASE }}
+sql: 'select * from {{ ASPECTS_EVENT_SINK_DATABASE }}.user_pii'
 params: null
 template_params: null
 filter_select_enabled: true

diff --git a/...aspects/build/aspects-superset/openedx-assets/assets/datasets/xapi_events_all_parsed.yaml b/...aspects/build/aspects-superset/openedx-assets/assets/datasets/xapi_events_all_parsed.yaml
@@ -183,7 +183,7 @@ metrics:
 normalize_columns: true
 offset: 0
 params: null
-schema: main
+schema: {{ ASPECTS_XAPI_DATABASE }}
 sql: SELECT * FROM {{ASPECTS_XAPI_DATABASE}}.xapi_events_all_parsed
 table_name: xapi_events_all_parsed
 template_params: null

diff --git a/tutoraspects/templates/openedx-assets/queries/indexed_events.sql b/tutoraspects/templates/openedx-assets/queries/indexed_events.sql
@@ -22,6 +22,6 @@ SELECT
   emission_time
 FROM events
 JOIN
-   event_sink.course_names courses
+   {{ ASPECTS_EVENT_SINK_DATABASE }}.course_names courses
 ON
   (events.course_key = courses.course_key)