From 43453166bc4ee042c19b9e74c31d79e941b77252 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Behmo?= Date: Mon, 11 Sep 2023 18:05:51 +0200 Subject: [PATCH] fix: convert `graded` field to boolean --- changelog.d/20230911_180425_regis_fix_graded.md | 1 + .../migrations.d/0009_add_graded_column_to_course_blocks.sql | 2 +- .../apps/clickhouse/migrations.d/0010_modify_graded_bool.sql | 2 ++ .../templates/cairn/apps/openedx/scripts/importcoursedata.py | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 changelog.d/20230911_180425_regis_fix_graded.md create mode 100644 tutorcairn/templates/cairn/apps/clickhouse/migrations.d/0010_modify_graded_bool.sql diff --git a/changelog.d/20230911_180425_regis_fix_graded.md b/changelog.d/20230911_180425_regis_fix_graded.md new file mode 100644 index 0000000..c893b99 --- /dev/null +++ b/changelog.d/20230911_180425_regis_fix_graded.md @@ -0,0 +1 @@ +- 💥[Improvement] Convert the `course_blocks.graded` field from String to Boolean. (by @regisb) diff --git a/tutorcairn/templates/cairn/apps/clickhouse/migrations.d/0009_add_graded_column_to_course_blocks.sql b/tutorcairn/templates/cairn/apps/clickhouse/migrations.d/0009_add_graded_column_to_course_blocks.sql index 9093a5f..7cbec04 100644 --- a/tutorcairn/templates/cairn/apps/clickhouse/migrations.d/0009_add_graded_column_to_course_blocks.sql +++ b/tutorcairn/templates/cairn/apps/clickhouse/migrations.d/0009_add_graded_column_to_course_blocks.sql @@ -1,2 +1,2 @@ ALTER TABLE course_blocks -ADD COLUMN graded String DEFAULT 'false'; \ No newline at end of file +ADD COLUMN graded String DEFAULT 'false'; diff --git a/tutorcairn/templates/cairn/apps/clickhouse/migrations.d/0010_modify_graded_bool.sql b/tutorcairn/templates/cairn/apps/clickhouse/migrations.d/0010_modify_graded_bool.sql new file mode 100644 index 0000000..bd09481 --- /dev/null +++ b/tutorcairn/templates/cairn/apps/clickhouse/migrations.d/0010_modify_graded_bool.sql @@ -0,0 +1,2 @@ +ALTER TABLE course_blocks +MODIFY COLUMN graded Boolean DEFAULT false; diff --git a/tutorcairn/templates/cairn/apps/openedx/scripts/importcoursedata.py b/tutorcairn/templates/cairn/apps/openedx/scripts/importcoursedata.py index 7ef0702..402a49b 100644 --- a/tutorcairn/templates/cairn/apps/openedx/scripts/importcoursedata.py +++ b/tutorcairn/templates/cairn/apps/openedx/scripts/importcoursedata.py @@ -42,7 +42,7 @@ def import_course(course_key): print("======================", course_id, course.display_name) values = [ sql_format( - "('{}', '{}', '{}', '{}', '{}', '{}', '{}')", + "('{}', '{}', '{}', '{}', '{}', '{}', {})", course_id, str(child.location), child.location.block_id,