Merge branch 'main' into arm-support

Author: bnmnetp

alembic/env.py

@@ -64,6 +64,9 @@
  auth_membership
  auth_permission
  auth_user
+ book_author
+ page_views
+ user_activity
  chapters
  clickablearea_answers
  code
@@ -192,6 +195,7 @@ def run_migrations_offline():
         url=url,
         target_metadata=target_metadata,
         literal_binds=True,
+        compare_type=True,
         dialect_opts={"paramstyle": "named"},
         include_name=include_name,
     )
@@ -211,6 +215,7 @@ def run_migrations_online():
     with connectable.connect() as connection:
         context.configure(
             connection=connection,
+            compare_type=True,
             target_metadata=target_metadata,
             include_name=include_name,
         )

bookserver/models.py

@@ -547,7 +547,7 @@ class QuestionGrade(Base, IdMixin):
     div_id = Column(String(512), nullable=False, index=True)
     # Manually-graded questions may be unscored (a NULL score).
     score = Column(Float(53))
-    comment = Column(Text, nullable=False)
+    comment = Column(Text, nullable=True)
     deadline = Column(DateTime)
     # Grades before the improved autograded and manually-scored grades lack this. Since it can refer to an ID from many different tables, don't make it a constraint.
     answer_id = Column(Integer)
@@ -749,7 +749,7 @@ class Library(Base, IdMixin):
     authors = Column(Text)
     shelf_section = Column(String(512))
     basecourse = Column(
-        String(512), ForeignKey("courses.course_name"), nullable=True, unique=True
+        String(512), ForeignKey("courses.course_name"), nullable=False, unique=True
     )
     build_system = Column(String(20))
     for_classes = Column(Web2PyBoolean)