From bd29318168a4f047e00a232bf93462db1b032252 Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Mon, 28 Nov 2011 16:57:58 +0900
Subject: [PATCH] catch incorrect ordinals on upgrade

---
 anki/stats.py   |  2 +-
 anki/upgrade.py | 28 +++++++++++++++++-----------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/anki/stats.py b/anki/stats.py
index 9c1a08637..451a769f5 100644
--- a/anki/stats.py
+++ b/anki/stats.py
@@ -21,7 +21,7 @@ class CardStats(object):
     def report(self):
         c = self.card
         fmt = lambda x, **kwargs: fmtTimeSpan(x, short=True, **kwargs)
-        self.txt = "<table width=100%%>"
+        self.txt = "<table width=100%>"
         self.addLine(_("Added"), self.date(c.id/1000))
         first = self.col.db.scalar(
             "select min(id) from revlog where cid = ?", c.id)
diff --git a/anki/upgrade.py b/anki/upgrade.py
index 39f74cddb..44446b54a 100644
--- a/anki/upgrade.py
+++ b/anki/upgrade.py
@@ -60,29 +60,35 @@ create index if not exists ix_fields_factId on fieldModels (factId);
 analyze;""")
         # fields missing a field model?
         if db.list("""
-    select id from fields where fieldModelId not in (
-    select distinct id from fieldModels)"""):
+select id from fields where fieldModelId not in (
+select distinct id from fieldModels)"""):
             return
         # facts missing a field?
         if db.list("""
-    select distinct facts.id from facts, fieldModels where
-    facts.modelId = fieldModels.modelId and fieldModels.id not in
-    (select fieldModelId from fields where factId = facts.id)"""):
+select distinct facts.id from facts, fieldModels where
+facts.modelId = fieldModels.modelId and fieldModels.id not in
+(select fieldModelId from fields where factId = facts.id)"""):
             return
         # cards missing a fact?
         if db.list("""
-    select id from cards where factId not in (select id from facts)"""):
+select id from cards where factId not in (select id from facts)"""):
             return
         # cards missing a card model?
         if db.list("""
-    select id from cards where cardModelId not in
-    (select id from cardModels)"""):
+select id from cards where cardModelId not in
+(select id from cardModels)"""):
             return
         # cards with a card model from the wrong model?
         if db.list("""
-    select id from cards where cardModelId not in (select cm.id from
-    cardModels cm, facts f where cm.modelId = f.modelId and
-    f.id = cards.factId)"""):
+select id from cards where cardModelId not in (select cm.id from
+cardModels cm, facts f where cm.modelId = f.modelId and
+f.id = cards.factId)"""):
+            return
+        # cards with the wrong ordinal?
+        if db.list("""
+select c.id from cards c, cardModels cm
+where c.cardModelId = cm.id
+and c.ordinal != cm.ordinal"""):
             return
         # facts missing a card?
         if db.list("""