From b9cc9bf0b2feef87d0bb3cbc1f9ed6159651afb7 Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Mon, 12 Mar 2012 13:49:32 +0900
Subject: [PATCH] deck upgrade

---
 anki/decks.py   |  2 ++
 anki/storage.py | 14 ++++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/anki/decks.py b/anki/decks.py
index 918269f0a..f0a10cc6b 100644
--- a/anki/decks.py
+++ b/anki/decks.py
@@ -20,6 +20,7 @@ defaultDeck = {
     'usn': 0,
     'desc': "",
     'dyn': 0,
+    'collapsed': False
 }
 
 defaultDynamicDeck = {
@@ -27,6 +28,7 @@ defaultDynamicDeck = {
     'revToday': [0, 0],
     'lrnToday': [0, 0],
     'timeToday': [0, 0],
+    'collapsed': False,
     'dyn': 1,
     'desc': "",
     'usn': 0,
diff --git a/anki/storage.py b/anki/storage.py
index 652e07f58..e08f605d1 100644
--- a/anki/storage.py
+++ b/anki/storage.py
@@ -46,8 +46,9 @@ def Collection(path, lock=True, server=False, sync=True):
 
 # no upgrades necessary at the moment
 def _upgradeSchema(db):
-    if db.scalar("select ver from col") == SCHEMA_VERSION:
-        return SCHEMA_VERSION
+    ver = db.scalar("select ver from col")
+    if ver == SCHEMA_VERSION:
+        return ver
     # add odid to cards, edue->odue
     ######################################################################
     if db.scalar("select ver from col") == 1:
@@ -71,10 +72,15 @@ id, guid, mid, mod, usn, tags, flds, sfld, csum, flags, data from notes2""")
         db.execute("drop table notes2")
         db.execute("update col set ver = 3")
         _updateIndices(db)
-    return SCHEMA_VERSION
+    return ver
 
 def _upgrade(col, ver):
-    return
+    if ver < 3:
+        # new deck properties
+        for d in col.decks.all():
+            d['dyn'] = 0
+            d['collapsed'] = False
+            col.decks.save(d)
 
 # Creating a new collection
 ######################################################################