From ae25a1f4259f98cdfdf5c5899c1247f650fddfbf Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 16 Jun 2021 14:55:04 +0530 Subject: [PATCH] Also add test without diacritics removal --- src/calibre/db/sqlite_extension.cpp | 2 +- src/calibre/db/tests/fts.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/calibre/db/sqlite_extension.cpp b/src/calibre/db/sqlite_extension.cpp index 4a66344849..3c53d22ece 100644 --- a/src/calibre/db/sqlite_extension.cpp +++ b/src/calibre/db/sqlite_extension.cpp @@ -108,7 +108,7 @@ private: int send_token(const icu::UnicodeString &token, int32_t start_offset, int32_t end_offset, int flags = 0) { token_buf.clear(); token_buf.reserve(4 * token.length()); token.toUTF8String(token_buf); - return current_callback(current_callback_ctx, flags, token_buf.c_str(), token_buf.size(), byte_offsets[start_offset], byte_offsets[end_offset]); + return current_callback(current_callback_ctx, flags, token_buf.c_str(), (int)token_buf.size(), byte_offsets[start_offset], byte_offsets[end_offset]); } public: diff --git a/src/calibre/db/tests/fts.py b/src/calibre/db/tests/fts.py index cd31cabb0c..d99082fdc4 100644 --- a/src/calibre/db/tests/fts.py +++ b/src/calibre/db/tests/fts.py @@ -50,4 +50,7 @@ class FTSTest(BaseTest): conn = TestConn() conn.insert_text('coộl') self.ae(conn.term_row_counts(), {'cool': 1, 'coộl': 1}) + conn = TestConn(remove_diacritics=False) + conn.insert_text('coộl') + self.ae(conn.term_row_counts(), {'coộl': 1}) # }}}