From 3d51bc7be3ed2b6836e37f6bbb57a72b857c34ab Mon Sep 17 00:00:00 2001
From: Feanil Patel <feanil@edx.org>
Date: Mon, 21 Oct 2019 10:53:59 -0400
Subject: [PATCH] Fix type mismatches in the bookmarks migration.
Mixing byte and unicode strings causes migrations to fail.
---
.../core/djangoapps/bookmarks/migrations/0001_initial.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/openedx/core/djangoapps/bookmarks/migrations/0001_initial.py b/openedx/core/djangoapps/bookmarks/migrations/0001_initial.py
index 3b2cddb6e9b..10499d71c3d 100644
--- a/openedx/core/djangoapps/bookmarks/migrations/0001_initial.py
+++ b/openedx/core/djangoapps/bookmarks/migrations/0001_initial.py
@@ -25,7 +25,7 @@ class Migration(migrations.Migration):
('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, verbose_name='modified', editable=False)),
('course_key', CourseKeyField(max_length=255, db_index=True)),
('usage_key', UsageKeyField(max_length=255, db_index=True)),
- ('_path', jsonfield.fields.JSONField(help_text=b'Path in course tree to the block', db_column=b'path')),
+ ('_path', jsonfield.fields.JSONField(help_text='Path in course tree to the block', db_column='path')),
('user', models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
],
),
@@ -37,8 +37,8 @@ class Migration(migrations.Migration):
('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, verbose_name='modified', editable=False)),
('course_key', CourseKeyField(max_length=255, db_index=True)),
('usage_key', UsageKeyField(unique=True, max_length=255, db_index=True)),
- ('display_name', models.CharField(default=b'', max_length=255)),
- ('_paths', jsonfield.fields.JSONField(default=[], help_text=b'All paths in course tree to the corresponding block.', db_column=b'paths')),
+ ('display_name', models.CharField(default='', max_length=255)),
+ ('_paths', jsonfield.fields.JSONField(default=[], help_text='All paths in course tree to the corresponding block.', db_column='paths')),
],
options={
'abstract': False,
--
GitLab