From 057b13e0af6689b0837c433efed2513d5a65c87b Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Mon, 30 Jan 2012 05:42:03 +0900
Subject: [PATCH] fix due # rewriting and correctly set nextPos

---
 anki/upgrade.py | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/anki/upgrade.py b/anki/upgrade.py
index df2aadf97..1cc89f8c5 100644
--- a/anki/upgrade.py
+++ b/anki/upgrade.py
@@ -627,15 +627,15 @@ and ord = ? limit 1""", m['id'], t['ord']):
     def _rewriteNewDue(self):
         col = self.col
         pos = 0
-        lastDue = None
         data = []
         for id, due in col.db.execute(
-            "select id, due from cards where type = 0"):
-            if due != lastDue:
-                pos += 1
-                lastDue = due
+            "select id, due from cards where type = 0 order by id"):
+            pos += 1
             data.append((pos, id))
         col.db.executemany("update cards set due = ? where id = ?", data)
+        # update insertion id
+        col.conf['nextPos'] = pos + 1
+        col.save()
 
     # Post-schema upgrade
     ######################################################################
@@ -694,10 +694,6 @@ update cards set due = cast(
         conf = col.decks.allConf()[0]
         if not conf['new']['order']:
             col.sched.randomizeCards(1)
-        # update insertion id
-        col.conf['nextPos'] = (
-            col.db.scalar("select max(id) from notes") or 0)+1
-        col.save()
         # optimize and finish
         col.db.commit()
         col.db.execute("vacuum")