GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-11-09 22:27:12 -05:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

remove some duplicate code in the upgrades

Browse source
This commit is contained in:
Damien Elmes 2011-02-11 07:42:19 +09:00
parent 1a3c8c0c1e
commit a45dac36c4
1 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
anki/deck.py
View file

@ -3757,11 +3757,6 @@ create index if not exists ix_cardTags_cardId on cardTags (cardId)""")
deck.updateFieldCache(deck.s.column0("select id from facts")) deck.updateFieldCache(deck.s.column0("select id from facts"))
deck.version = 48 deck.version = 48
deck.s.commit() deck.s.commit()
if deck.version < 50:
# more new type handling
deck.rebuildTypes()
deck.version = 50
deck.s.commit()
if deck.version < 52: if deck.version < 52:
dname = deck.name() dname = deck.name()
sname = deck.syncName sname = deck.syncName
@ -3798,9 +3793,6 @@ this message. (ERR-0101)""") % {
deck.s.statement("update fieldModels set editFontFamily = 1"); deck.s.statement("update fieldModels set editFontFamily = 1");
deck.version = 54 deck.version = 54
deck.s.commit() deck.s.commit()
if deck.version < 57:
deck.version = 57
deck.s.commit()
if deck.version < 61: if deck.version < 61:
# do our best to upgrade templates to the new style # do our best to upgrade templates to the new style
txt = '''\ txt = '''\
@ -3844,13 +3836,8 @@ this message. (ERR-0101)""") % {
deck.s.commit() deck.s.commit()
if deck.version < 62: if deck.version < 62:
# updated indices # updated indices
for d in ("intervalDesc", "intervalAsc", "randomOrder",
"dueAsc", "dueDesc"):
deck.s.statement("drop index if exists ix_cards_%s2" % d)
deck.s.statement("drop index if exists ix_cards_typeCombined") deck.s.statement("drop index if exists ix_cards_typeCombined")
DeckStorage._addIndices(deck) DeckStorage._addIndices(deck)
deck.updateDynamicIndices()
deck.s.execute("vacuum")
deck.version = 62 deck.version = 62
deck.s.commit() deck.s.commit()
if deck.version < 64: if deck.version < 64:
@ -3858,7 +3845,6 @@ this message. (ERR-0101)""") % {
for d in ("ix_cards_duePriority", for d in ("ix_cards_duePriority",
"ix_cards_priorityDue"): "ix_cards_priorityDue"):
deck.s.statement("drop index if exists %s" % d) deck.s.statement("drop index if exists %s" % d)
deck.s.execute("analyze")
deck.version = 64 deck.version = 64
deck.s.commit() deck.s.commit()
# note: we keep the priority index for now # note: we keep the priority index for now
@ -3875,11 +3861,13 @@ this message. (ERR-0101)""") % {
"dueAsc", "dueDesc"): "dueAsc", "dueDesc"):
deck.s.statement("drop index if exists ix_cards_%s2" % d) deck.s.statement("drop index if exists ix_cards_%s2" % d)
deck.s.statement("drop index if exists ix_cards_%s" % d) deck.s.statement("drop index if exists ix_cards_%s" % d)
deck.updateDynamicIndices()
# remove old views # remove old views
for v in ("failedCards", "revCardsOld", "revCardsNew", for v in ("failedCards", "revCardsOld", "revCardsNew",
"revCardsDue", "revCardsRandom", "acqCardsRandom", "revCardsDue", "revCardsRandom", "acqCardsRandom",
"acqCardsOld", "acqCardsNew"): "acqCardsOld", "acqCardsNew"):
deck.s.statement("drop view if exists %s" % v) deck.s.statement("drop view if exists %s" % v)
deck.s.execute("vacuum")
deck.s.execute("analyze") deck.s.execute("analyze")
deck.version = 70 deck.version = 70
deck.s.commit() deck.s.commit()