diff --git a/models/courses/unit_tests.yaml b/models/courses/unit_tests.yaml index 284973c9..2832807e 100644 --- a/models/courses/unit_tests.yaml +++ b/models/courses/unit_tests.yaml @@ -39,8 +39,9 @@ unit_tests: rows: | select * from event_sink.course_overviews expect: - format: csv - fixture: dim_course_names_expected + format: sql + rows: | + select * from dim_course_names_expected - name: test_dim_most_recent_course_blocks model: dim_most_recent_course_blocks diff --git a/models/grading/unit_tests.yaml b/models/grading/unit_tests.yaml index 9c2ffa48..2aa96752 100644 --- a/models/grading/unit_tests.yaml +++ b/models/grading/unit_tests.yaml @@ -9,8 +9,9 @@ unit_tests: rows: | select * from grading_events expect: - format: csv - fixture: dim_learner_most_recent_course_grade_expected + format: sql + rows: | + select * from dim_learner_most_recent_course_grade_expected - name: test_dim_learner_most_recent_course_state model: dim_learner_most_recent_course_state @@ -22,8 +23,9 @@ unit_tests: rows: | select * from grading_events expect: - format: csv - fixture: dim_learner_most_recent_course_state_expected + format: sql + rows: | + select * from dim_learner_most_recent_course_state_expected - name: test_dim_student_status model: dim_student_status diff --git a/models/users/unit_tests.yaml b/models/users/unit_tests.yaml index bc503db9..83985985 100644 --- a/models/users/unit_tests.yaml +++ b/models/users/unit_tests.yaml @@ -13,5 +13,6 @@ unit_tests: rows: | select * from event_sink.external_id expect: - format: csv - fixture: user_pii_expected + format: sql + rows: | + select * from user_pii_expected diff --git a/requirements.txt b/requirements.txt index e885eef0..bb0ca795 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ -dbt-clickhouse==1.8.7 -dbt-core~=1.8.0 +dbt-clickhouse==1.9.4 +dbt-core~=1.9.0 shandy-sqlfmt[jinjafmt]==0.26.0 dbt-coverage clickhouse-cityhash diff --git a/tests/fixtures/dim_course_names_expected.csv b/tests/fixtures/dim_course_names_expected.csv deleted file mode 100644 index 61813f61..00000000 --- a/tests/fixtures/dim_course_names_expected.csv +++ /dev/null @@ -1,11 +0,0 @@ -"course_key","course_name","course_run","org" -"course-v1:Org0+DemoX+2bc51b","2bc51b (small)","2bc51b","Org0" -"course-v1:Org0+DemoX+81bba1","81bba1 (small)","81bba1","Org0" -"course-v1:Org3+DemoX+528fdd","528fdd (small)","528fdd","Org3" -"course-v1:Org2+DemoX+682526","682526 (medium)","682526","Org2" -"course-v1:Org7+DemoX+57295b","57295b (medium)","57295b","Org7" -"course-v1:Org8+DemoX+3fefec","3fefec (medium)","3fefec","Org8" -"course-v1:Org4+DemoX+db4c73","db4c73 (large)","db4c73","Org4" -"course-v1:Org1+DemoX+1937e7","1937e7 (large)","1937e7","Org1" -"course-v1:Org4+DemoX+0b1656","0b1656 (huge)","0b1656","Org4" -"course-v1:Org2+DemoX+e4380c","e4380c (huge)","e4380c","Org2" \ No newline at end of file diff --git a/tests/fixtures/fact_transcript_usage_expected.csv b/tests/fixtures/fact_transcript_usage_expected.csv deleted file mode 100644 index 65b10424..00000000 --- a/tests/fixtures/fact_transcript_usage_expected.csv +++ /dev/null @@ -1,6 +0,0 @@ -"emission_time","org","course_key","course_name","course_run","video_id","video_name","video_name_with_location","course_order","actor_id","username","name","email" -"2024-02-20 04:38:05","Org0","course-v1:Org0+DemoX+2bc51b","2bc51b (small)","2bc51b","block-v1:course-v1:Org0+DemoX+2bc51b+type@video+block@8bece230","Video 3","3:3:2 - Video 3","3","3058e600-5bee-4018-920e-52a311963d88","actor_53","Actor 53","actor_53@aspects.invalid" -"2021-06-05 11:28:29","Org1","course-v1:Org1+DemoX+1937e7","1937e7 (large)","1937e7","block-v1:course-v1:Org1+DemoX+1937e7+type@video+block@4c444c3c","Video 11","1:14:0 - Video 11","11","33909a28-f02d-414f-9794-58bfb18cb977","actor_54","Actor 54","actor_54@aspects.invalid" -"2022-03-12 02:05:38","Org2","course-v1:Org2+DemoX+e4380c","e4380c (huge)","e4380c","block-v1:course-v1:Org2+DemoX+e4380c+type@video+block@19dff631","Video 12","2:12:0 - Video 12","12","bc9d00aa-2239-4a94-90de-b3ea4d390bc0","actor_60","Actor 60","actor_60@aspects.invalid" -"2019-11-18 06:36:21","Org3","course-v1:Org3+DemoX+528fdd","528fdd (small)","528fdd","block-v1:course-v1:Org3+DemoX+528fdd+type@video+block@108f2bd2","Video 3","3:0:0 - Video 3","3","c838016f-6640-44d9-a038-33a7cc4018a9","actor_17","Actor 17","actor_17@aspects.invalid" -"2021-04-02 02:13:04","Org8","course-v1:Org8+DemoX+3fefec","3fefec (medium)","3fefec","block-v1:course-v1:Org8+DemoX+3fefec+type@video+block@15aac843","Video 8","1:4:3 - Video 8","8","47f03e71-bf89-470b-8cb5-8affbc109aff","actor_11","Actor 11","actor_11@aspects.invalid" \ No newline at end of file diff --git a/unit-test-seeds/courses/dim_course_names_expected.csv b/unit-test-seeds/courses/dim_course_names_expected.csv new file mode 100644 index 00000000..28f8cade --- /dev/null +++ b/unit-test-seeds/courses/dim_course_names_expected.csv @@ -0,0 +1,11 @@ +"course_key","course_name","course_run","org","tags_str" +"course-v1:Org0+DemoX+2bc51b","2bc51b (small)","2bc51b","Org0","" +"course-v1:Org0+DemoX+81bba1","81bba1 (small)","81bba1","Org0","" +"course-v1:Org3+DemoX+528fdd","528fdd (small)","528fdd","Org3","" +"course-v1:Org2+DemoX+682526","682526 (medium)","682526","Org2","" +"course-v1:Org7+DemoX+57295b","57295b (medium)","57295b","Org7","" +"course-v1:Org8+DemoX+3fefec","3fefec (medium)","3fefec","Org8","" +"course-v1:Org4+DemoX+db4c73","db4c73 (large)","db4c73","Org4","" +"course-v1:Org1+DemoX+1937e7","1937e7 (large)","1937e7","Org1","" +"course-v1:Org4+DemoX+0b1656","0b1656 (huge)","0b1656","Org4","" +"course-v1:Org2+DemoX+e4380c","e4380c (huge)","e4380c","Org2","" \ No newline at end of file diff --git a/unit-test-seeds/courses/seeds.yaml b/unit-test-seeds/courses/seeds.yaml index a51a2a69..a2caccbb 100644 --- a/unit-test-seeds/courses/seeds.yaml +++ b/unit-test-seeds/courses/seeds.yaml @@ -4,4 +4,8 @@ seeds: - name: dim_most_recent_course_blocks_expected config: column_types: - dump_id: UUID \ No newline at end of file + dump_id: UUID + - name: dim_course_names_expected + config: + column_types: + tags_str: String \ No newline at end of file diff --git a/tests/fixtures/dim_learner_most_recent_course_grade_expected.csv b/unit-test-seeds/grading/dim_learner_most_recent_course_grade_expected.csv similarity index 100% rename from tests/fixtures/dim_learner_most_recent_course_grade_expected.csv rename to unit-test-seeds/grading/dim_learner_most_recent_course_grade_expected.csv diff --git a/tests/fixtures/dim_learner_most_recent_course_state_expected.csv b/unit-test-seeds/grading/dim_learner_most_recent_course_state_expected.csv similarity index 100% rename from tests/fixtures/dim_learner_most_recent_course_state_expected.csv rename to unit-test-seeds/grading/dim_learner_most_recent_course_state_expected.csv diff --git a/tests/fixtures/user_pii_expected.csv b/unit-test-seeds/users/user_pii_expected.csv similarity index 100% rename from tests/fixtures/user_pii_expected.csv rename to unit-test-seeds/users/user_pii_expected.csv