From cdac2bf8d7a9f208d2a35050d009f3a7708686fe Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Thu, 9 Dec 2010 10:43:45 +0900
Subject: [PATCH] workaround card ordering bug from older versions

---
 anki/deck.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/anki/deck.py b/anki/deck.py
index 10c986334..103a675ab 100644
--- a/anki/deck.py
+++ b/anki/deck.py
@@ -69,7 +69,7 @@ SEARCH_FIELD = 6
 SEARCH_FIELD_EXISTS = 7
 SEARCH_QA = 8
 SEARCH_PHRASE_WB = 9
-DECK_VERSION = 57
+DECK_VERSION = 58
 
 deckVarsTable = Table(
     'deckVars', metadata,
@@ -4313,6 +4313,17 @@ or quizFontFamily is null""")
             deck.s.statement("analyze")
             deck.version = 57
             deck.s.commit()
+        if deck.version < 58:
+            # orderNewCards() had a bug in older versions where combinedDue
+            # was not updated, and since we're sorting on combinedDue now we
+            # need to make sure it's correct. This will discard any spacing
+            # the cards had.
+            if deck.newCardOrder != 0:
+                deck.s.statement("""
+update cards set due = created, combinedDue = created
+where relativeDelay = 2""")
+            deck.version = 58
+            deck.s.commit()
         # executing a pragma here is very slow on large decks, so we store
         # our own record
         if not deck.getInt("pageSize") == 4096: