mirror/sqlitebrowser
1
0
Fork 0
mirror of https://github.com/sqlitebrowser/sqlitebrowser.git synced 2026-01-20 02:50:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix default collation for UTF16 strings

Browse Source 
Fix our default collation which we install when an unknown collation is
requested to (more or less) support UTF16 strings as well. Before this
UTF16 strings wouldn't compare correctly because they might contain null
bytes which would lead to only the first (few) byte(s) getting compared.

See issue #1172.
This commit is contained in:
Martin Kleusberg
2017-10-19 14:54:30 +02:00
parent 32da4de94d
commit 4ae601dafd
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/sqlitedb.cpp
View File

@@ -29,11 +29,8 @@ template <typename Ret, typename... Params>
std::function<Ret(Params...)> Callback<Ret(Params...)>::func;
// collation callbacks
int collCompare(void* /*pArg*/, int /*eTextRepA*/, const void* sA, int /*eTextRepB*/, const void* sB)
int collCompare(void* /*pArg*/, int sizeA, const void* sA, int sizeB, const void* sB)
{
size_t sizeA = strlen((const char*)sA);
size_t sizeB = strlen((const char*)sB);
if(sizeA == sizeB)
return memcmp(sA, sB, sizeA);
return sizeA - sizeB;

2
src/sqlitedb.h
View File

@@ -19,7 +19,7 @@ enum
typedef QMultiMap<QString, sqlb::ObjectPtr> objectMap; // Maps from object type (table, index, view, trigger) to a pointer to the object representation
typedef QMap<QString, objectMap> schemaMap; // Maps from the schema name (main, temp, attached schemas) to the object map for that schema
int collCompare(void* pArg, int eTextRepA, const void* sA, int eTextRepB, const void* sB);
int collCompare(void* pArg, int sizeA, const void* sA, int sizeB, const void* sB);
class DBBrowserDB : public QObject
{