GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-20 15:02:21 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

drop .cursor()

Browse source
This commit is contained in:
Damien Elmes 2020-03-03 08:36:11 +10:00
parent 87415c0d7f
commit 5778459d7c
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
pylib/anki/collection.py
View file

@ -793,7 +793,6 @@ select id from notes where mid = ?) limit 1"""
problems = [] problems = []
# problems that don't require a full sync # problems that don't require a full sync
syncable_problems = [] syncable_problems = []
curs = self.db.cursor()
self.save() self.save()
oldSize = os.stat(self.path)[stat.ST_SIZE] oldSize = os.stat(self.path)[stat.ST_SIZE]
if self.db.scalar("pragma integrity_check") != "ok": if self.db.scalar("pragma integrity_check") != "ok":
@ -942,16 +941,18 @@ select id from cards where odid > 0 and did in %s"""
self.updateFieldCache(self.models.nids(m)) self.updateFieldCache(self.models.nids(m))
# new cards can't have a due position > 32 bits, so wrap items over # new cards can't have a due position > 32 bits, so wrap items over
# 2 million back to 1 million # 2 million back to 1 million
curs.execute( self.db.execute(
""" """
update cards set due=1000000+due%1000000,mod=?,usn=? where due>=1000000 update cards set due=1000000+due%1000000,mod=?,usn=? where due>=1000000
and type=0""", and type=0""",
[intTime(), self.usn()], intTime(),
self.usn(),
) )
if curs.rowcount: rowcount = self.db.scalar("select changes()")
if rowcount:
problems.append( problems.append(
"Found %d new cards with a due number >= 1,000,000 - consider repositioning them in the Browse screen." "Found %d new cards with a due number >= 1,000,000 - consider repositioning them in the Browse screen."
% curs.rowcount % rowcount
) )
# new card position # new card position
self.conf["nextPos"] = ( self.conf["nextPos"] = (
@ -969,18 +970,20 @@ and type=0""",
self.usn(), self.usn(),
) )
# v2 sched had a bug that could create decimal intervals # v2 sched had a bug that could create decimal intervals
curs.execute( self.db.execute(
"update cards set ivl=round(ivl),due=round(due) where ivl!=round(ivl) or due!=round(due)" "update cards set ivl=round(ivl),due=round(due) where ivl!=round(ivl) or due!=round(due)"
) )
if curs.rowcount: rowcount = self.db.scalar("select changes()")
problems.append("Fixed %d cards with v2 scheduler bug." % curs.rowcount) if rowcount:
problems.append("Fixed %d cards with v2 scheduler bug." % rowcount)
curs.execute( self.db.execute(
"update revlog set ivl=round(ivl),lastIvl=round(lastIvl) where ivl!=round(ivl) or lastIvl!=round(lastIvl)" "update revlog set ivl=round(ivl),lastIvl=round(lastIvl) where ivl!=round(ivl) or lastIvl!=round(lastIvl)"
) )
if curs.rowcount: rowcount = self.db.scalar("select changes()")
if rowcount:
problems.append( problems.append(
"Fixed %d review history entries with v2 scheduler bug." % curs.rowcount "Fixed %d review history entries with v2 scheduler bug." % rowcount
) )
# models # models
if self.models.ensureNotEmpty(): if self.models.ensureNotEmpty():

5
pylib/anki/dbproxy.py
View file

@ -7,7 +7,7 @@
import time import time
from sqlite3 import Cursor from sqlite3 import Cursor
from sqlite3 import dbapi2 as sqlite from sqlite3 import dbapi2 as sqlite
from typing import Any, List, Type from typing import Any, List
class DBProxy: class DBProxy:
@ -67,6 +67,3 @@ class DBProxy:
self._db.isolation_level = None self._db.isolation_level = None
else: else:
self._db.isolation_level = "" self._db.isolation_level = ""
def cursor(self, factory: Type[Cursor] = Cursor) -> Cursor:
return self._db.cursor(factory)