firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-24 02:43:03 +01:00
Code Issues

Case-insensitive character class names (CORE-2952)

Browse Source
This commit is contained in:
aafemt 2010-03-31 09:42:01 +00:00
parent 513c48c3a6
commit 9a950395b0
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/jrd/SimilarToMatcher.h
View File

@ -785,10 +785,10 @@ void SimilarToMatcher<CharType, StrConverter>::Evaluator::parsePrimary(int* flag
struct struct
{ {
const GetCanonicalFunc* funcs; const GetCanonicalFunc* funcs;
const ULONG nameLen; const ULONG nameLen; // in bytes, not characters because all functions accept length in bytes
const USHORT name[10]; const USHORT name[10];
} static const classes[] = } static const classes[] =
{ { // Names are in utf16 in order not to convert them every time for comparsion and thus save some CPU
{alNum, 10, {'A','L','N','U','M'}}, {alNum, 10, {'A','L','N','U','M'}},
{alpha, 10, {'A','L','P','H','A'}}, {alpha, 10, {'A','L','P','H','A'}},
{digit, 10, {'D','I','G','I','T'}}, {digit, 10, {'D','I','G','I','T'}},
@ -802,6 +802,10 @@ void SimilarToMatcher<CharType, StrConverter>::Evaluator::parsePrimary(int* flag
ULONG classNameLen = charSet->getConvToUnicode().convert(len, reinterpret_cast<const UCHAR*>(start), ULONG classNameLen = charSet->getConvToUnicode().convert(len, reinterpret_cast<const UCHAR*>(start),
className.getCapacity()*sizeof(USHORT), className.begin()); className.getCapacity()*sizeof(USHORT), className.begin());
// Bring class name to uppercase for case-insensitivity
// Do it in utf16 because original collation can have no uppercase conversion
classNameLen = Jrd::UnicodeUtil::utf16UpperCase(classNameLen, className.begin(),
className.getCapacity()*sizeof(USHORT), className.begin(), NULL);
int classN; int classN;
for (classN = 0; classN < FB_NELEM(classes); ++classN) for (classN = 0; classN < FB_NELEM(classes); ++classN)