Merge pull request #1280 from jhamrick/fix-sqlite

Fix inappropriate use of sum with newer sqlite

Author: jhamrick

.travis.yml

@@ -2,6 +2,7 @@ language: python
 python:
   - 3.5
   - 3.6
+  - 3.7
   - nightly
 env:
   global:
@@ -14,10 +15,14 @@ matrix:
   exclude:
   - python: 3.5
     env: GROUP=docs
+  - python: 3.6
+    env: GROUP=docs
   - python: nightly
     env: GROUP=docs
   - python: 3.5
     env: GROUP=nbextensions
+  - python: 3.6
+    env: GROUP=nbextensions
   - python: nightly
     env: GROUP=nbextensions
 addons:

azure-pipelines.yml

@@ -18,8 +18,11 @@ strategy:
     Python36:
       python.version: '3.6'
       testgroup: 'python'
-    Python36Extensions:
-      python.version: '3.6'
+    Python37:
+      python.version: '3.7'
+      testgroup: 'python'
+    Python37Extensions:
+      python.version: '3.7'
       testgroup: 'nbextensions'
 
 steps:

nbgrader/api.py

@@ -841,6 +841,7 @@ def max_score(self):
             return self.max_score_taskcell
         else:
             return self.max_score_gradecell
+
     #: Whether the autograded score is a result of failed autograder tests. This
     #: is True if the autograder score is zero and the cell type is "code", and
     #: otherwise False.
@@ -2962,7 +2963,13 @@ def student_dicts(self):
             A list of dictionaries, one per student
 
         """
-        total_score, = self.db.query(func.sum(Assignment.max_score)).one()
+        max_scores = self.db.query(
+            Assignment.id,
+            func.sum(Assignment.max_score).label("max_score")
+        ).group_by(Assignment.id).subquery()
+        _max_scores = func.coalesce(max_scores.c.max_score, 0.0)
+        total_score, = self.db.query(func.sum(_max_scores)).one()
+
         if len(self.assignments) > 0 and total_score > 0:
             # subquery the scores
             scores = self.db.query(

nbgrader/tests/api/test_models.py

@@ -673,13 +673,20 @@ def test_query_needs_manual_grade_manualgraded(submissions):
 def test_query_max_score(submissions):
     db = submissions[0]
 
-    assert [5, 10] == sorted([x[0] for x in db.query(api.GradeCell.max_score).all()])
-    assert [5, 5, 10, 10] == sorted([x[1] for x in db.query(api.Grade.id, api.Grade.max_score).all()])
-    assert [15] == sorted([x[1] for x in db.query(api.Notebook.id, api.Notebook.max_score).all()])
-    assert [15, 15] == sorted([x[1] for x in db.query(api.SubmittedNotebook.id, api.SubmittedNotebook.max_score).all()])
-    assert [15] == sorted([x[1] for x in db.query(api.Assignment.id, api.Assignment.max_score).all()])
-    assert [15, 15] == sorted([x[1] for x in db.query(api.SubmittedAssignment.id, api.SubmittedAssignment.max_score).all()])
-    assert [15, 15] == sorted([x[1] for x in db.query(api.Student.id, api.Student.max_score).all()])
+    assert [5, 10] == sorted([x[1] for x in db.query(
+        api.GradeCell.id, api.GradeCell.max_score).group_by(api.GradeCell.id).all()])
+    assert [5, 5, 10, 10] == sorted([x[1] for x in db.query(
+        api.Grade.id, api.Grade.max_score).group_by(api.Grade.id).all()])
+    assert [15] == sorted([x[1] for x in db.query(
+        api.Notebook.id, api.Notebook.max_score).group_by(api.Notebook.id).all()])
+    assert [15, 15] == sorted([x[1] for x in db.query(
+        api.SubmittedNotebook.id, api.SubmittedNotebook.max_score).group_by(api.SubmittedNotebook.id).all()])
+    assert [15] == sorted([x[1] for x in db.query(
+        api.Assignment.id, api.Assignment.max_score).group_by(api.Assignment.id).all()])
+    assert [15, 15] == sorted([x[1] for x in db.query(
+        api.SubmittedAssignment.id, api.SubmittedAssignment.max_score).group_by(api.SubmittedAssignment.id).all()])
+    assert [15, 15] == sorted([x[1] for x in db.query
+        (api.Student.id, api.Student.max_score).group_by(api.Student.id).all()])
 
 
 def test_query_score_ungraded(submissions):