From f03ae1c45af31ef179db873badbda5f55d1e92d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Pokorn=C3=BD=20=28Rai=29?= <agentydragon@gmail.com>
Date: Fri, 27 Dec 2019 19:25:22 +0100
Subject: [PATCH] Use self._deckLimit helper

---
 anki/schedv2.py | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/anki/schedv2.py b/anki/schedv2.py
index e608db973..1d9216694 100644
--- a/anki/schedv2.py
+++ b/anki/schedv2.py
@@ -473,7 +473,7 @@ select count() from
             """
 select count() from cards where id in (
 select id from cards where did in %s and queue = 0 limit ?)"""
-            % ids2str(self.col.decks.active()),
+            % self._deckLimit(),
             self.reportLimit,
         )
 
@@ -881,9 +881,10 @@ and due <= ? limit ?)"""
         self.revCount = self.col.db.scalar(
             """
 select count() from (select id from cards where
-did in %s and queue = 2 and due <= ? limit %d)"""
-            % (ids2str(self.col.decks.active()), lim),
+did in %s and queue = 2 and due <= ? limit ?)"""
+            % self._deckLimit(),
             self.today,
+            lim,
         )
 
     def _resetRev(self) -> None:
@@ -904,7 +905,7 @@ select id from cards where
 did in %s and queue = 2 and due <= ?
 order by due, random()
 limit ?"""
-                % (ids2str(self.col.decks.active())),
+                % self._deckLimit(),
                 self.today,
                 lim,
             )
@@ -931,7 +932,7 @@ limit ?"""
             """
 select count() from cards where id in (
 select id from cards where did in %s and queue = 2 and due <= ? limit ?)"""
-            % ids2str(self.col.decks.active()),
+            % self._deckLimit(),
             self.today,
             self.reportLimit,
         )
@@ -1474,16 +1475,16 @@ To study outside of the normal schedule, click the Custom Study button below."""
         )
 
     def haveBuriedSiblings(self) -> bool:
-        sdids = ids2str(self.col.decks.active())
         cnt = self.col.db.scalar(
-            "select 1 from cards where queue = -2 and did in %s limit 1" % sdids
+            "select 1 from cards where queue = -2 and did in %s limit 1"
+            % self._deckLimit()
         )
         return not not cnt
 
     def haveManuallyBuried(self) -> bool:
-        sdids = ids2str(self.col.decks.active())
         cnt = self.col.db.scalar(
-            "select 1 from cards where queue = -3 and did in %s limit 1" % sdids
+            "select 1 from cards where queue = -3 and did in %s limit 1"
+            % self._deckLimit()
         )
         return not not cnt
 
@@ -1616,15 +1617,15 @@ update cards set queue=?,mod=?,usn=? where id in """
         else:
             raise Exception("unknown type")
 
-        sids = ids2str(self.col.decks.active())
         self.col.log(
             self.col.db.list(
-                "select id from cards where %s and did in %s" % (queue, sids)
+                "select id from cards where %s and did in %s"
+                % (queue, self._deckLimit())
             )
         )
         self.col.db.execute(
             "update cards set mod=?,usn=?,%s where %s and did in %s"
-            % (self._restoreQueueSnippet, queue, sids),
+            % (self._restoreQueueSnippet, queue, self._deckLimit()),
             intTime(),
             self.col.usn(),
         )