Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Raise a defined error when invalid query passed to FTS engine

Browse Source
This commit is contained in:
Kovid Goyal 2020-06-15 10:34:03 +05:30
parent 6092abe13c
commit 3670ec8d27
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/calibre/db/backend.py
View File

@ -42,14 +42,15 @@ from calibre.db.tables import (OneToOneTable, ManyToOneTable, ManyToManyTable,
CompositeTable, UUIDTable, RatingTable) CompositeTable, UUIDTable, RatingTable)
# }}} # }}}
'''
Differences in semantics from pysqlite:
1. execute/executemany operate in autocommit mode class FTSQueryError(ValueError):
2. There is no fetchone() method on cursor objects, instead use next(cursor)
3. There is no executescript def __init__(self, query, sql_statement, apsw_error):
ValueError.__init__(self, 'Failed to parse search query: {} with error: {}'.format(query, apsw_error))
self.query = query
self.sql_statement = sql_statement
'''
CUSTOM_DATA_TYPES = frozenset(('rating', 'text', 'comments', 'datetime', CUSTOM_DATA_TYPES = frozenset(('rating', 'text', 'comments', 'datetime',
'int', 'float', 'bool', 'series', 'composite', 'enumeration')) 'int', 'float', 'bool', 'series', 'composite', 'enumeration'))
WINDOWS_RESERVED_NAMES = frozenset('CON PRN AUX NUL COM1 COM2 COM3 COM4 COM5 COM6 COM7 COM8 COM9 LPT1 LPT2 LPT3 LPT4 LPT5 LPT6 LPT7 LPT8 LPT9'.split()) WINDOWS_RESERVED_NAMES = frozenset('CON PRN AUX NUL COM1 COM2 COM3 COM4 COM5 COM6 COM7 COM8 COM9 LPT1 LPT2 LPT3 LPT4 LPT5 LPT6 LPT7 LPT8 LPT9'.split())
@ -1798,6 +1799,7 @@ class DB(object):
if annotation_type: if annotation_type:
query += ' AND annotations.annot_type = ? ' query += ' AND annotations.annot_type = ? '
data.append(annotation_type) data.append(annotation_type)
try:
for (rowid, book_id, fmt, user_type, user, annot_data, text) in self.execute(query, tuple(data)): for (rowid, book_id, fmt, user_type, user, annot_data, text) in self.execute(query, tuple(data)):
yield { yield {
'id': rowid, 'id': rowid,
@ -1808,6 +1810,8 @@ class DB(object):
'text': text, 'text': text,
'annotation': annot_data 'annotation': annot_data
} }
except apsw.SQLError as e:
raise FTSQueryError(fts_engine_query, query, e)
def all_annotations_for_book(self, book_id): def all_annotations_for_book(self, book_id):
for (fmt, user_type, user, data) in self.execute('SELECT format, user_type, user, annot_data FROM annotations WHERE book=?', (book_id,)): for (fmt, user_type, user, data) in self.execute('SELECT format, user_type, user, annot_data FROM annotations WHERE book=?', (book_id,)):

2
src/calibre/db/tests/writing.py
View File

@ -14,6 +14,7 @@ from calibre.ebooks.metadata import author_to_author_sort, title_sort
from calibre.ebooks.metadata.book.base import Metadata from calibre.ebooks.metadata.book.base import Metadata
from calibre.utils.date import UNDEFINED_DATE from calibre.utils.date import UNDEFINED_DATE
from calibre.db.tests.base import BaseTest, IMG from calibre.db.tests.base import BaseTest, IMG
from calibre.db.backend import FTSQueryError
from polyglot.builtins import iteritems, itervalues, unicode_type from polyglot.builtins import iteritems, itervalues, unicode_type
@ -811,6 +812,7 @@ class WritingTest(BaseTest):
self.assertEqual(results[0]['text'], '[bookmark1] changed') self.assertEqual(results[0]['text'], '[bookmark1] changed')
results = cache.search_annotations('"word"', highlight_start='[', highlight_end=']', snippet_size=3) results = cache.search_annotations('"word"', highlight_start='[', highlight_end=']', snippet_size=3)
self.assertEqual(results[0]['text'], '…some [word] changed…') self.assertEqual(results[0]['text'], '…some [word] changed…')
self.assertRaises(FTSQueryError, cache.search_annotations, 'AND OR')
annot_list[0][0]['title'] = 'changed title' annot_list[0][0]['title'] = 'changed title'
cache.set_annotations_for_book(1, 'moo', annot_list) cache.set_annotations_for_book(1, 'moo', annot_list)