arno/isso
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove limit, introduced unnecessary complexity

Browse Source
This commit is contained in:
posativ 2012-10-21 22:37:39 +02:00
parent 3b197c4c3c
commit d2bc2537a1
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
isso/db.py
View File

@ -51,7 +51,7 @@ class Abstract:
return return
@abc.abstractmethod @abc.abstractmethod
def retrieve(self, path, limit=20): def retrieve(self, path, mode):
return return
@ -145,10 +145,10 @@ class SQLite(Abstract):
(None, path, id)) (None, path, id))
return self.get(path, id) return self.get(path, id)
def retrieve(self, path, limit=20, mode=1): def retrieve(self, path, mode=1):
with sqlite3.connect(self.dbpath) as con: with sqlite3.connect(self.dbpath) as con:
rv = con.execute("SELECT * FROM comments WHERE path=? AND (? | mode) = ?" \ rv = con.execute("SELECT * FROM comments WHERE path=? AND (? | mode) = ?" \
+ " ORDER BY id ASC LIMIT ?;", (path, mode, mode, limit)).fetchall() + " ORDER BY id ASC;", (path, mode, mode)).fetchall()
for item in rv: for item in rv:
yield self.query2comment(item) yield self.query2comment(item)

3
specs/test_comment.py
View File

@ -53,7 +53,7 @@ class TestComments(unittest.TestCase):
def testCreateAndGetMultiple(self): def testCreateAndGetMultiple(self):
for i in range(100): for i in range(20):
self.post('/comment/path/new', data=json.dumps(comment(text='Spam'))) self.post('/comment/path/new', data=json.dumps(comment(text='Spam')))
r = self.get('/comment/path/') r = self.get('/comment/path/')
@ -61,7 +61,6 @@ class TestComments(unittest.TestCase):
rv = json.loads(r.data) rv = json.loads(r.data)
assert len(rv) == 20 assert len(rv) == 20
# XXX limit=100
def testGetInvalid(self): def testGetInvalid(self):