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

Frontport fix for CORE-4244 - Problem with creation procedure which contain adding text in DOS864 charset.

Browse Source
This commit is contained in:
asfernandes 2013-10-15 15:26:34 +00:00
parent 8c6b3538fd
commit 51b0d1aca4
4 changed files with 63 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/common/CharSet.h
View File

@ -55,10 +55,27 @@ protected:
: id(_id),
cs(_cs)
{
sqlMatchAnyLength = getConvFromUnicode().convert(
sizeof(SQL_MATCH_ANY_CHARS), &SQL_MATCH_ANY_CHARS, sizeof(sqlMatchAny), sqlMatchAny);
sqlMatchOneLength = getConvFromUnicode().convert(
sizeof(SQL_MATCH_1_CHAR), &SQL_MATCH_1_CHAR, sizeof(sqlMatchOne), sqlMatchOne);
try
{
sqlMatchAnyLength = getConvFromUnicode().convert(sizeof(SQL_MATCH_ANY_CHARS),
&SQL_MATCH_ANY_CHARS, sizeof(sqlMatchAny), sqlMatchAny);
}
catch (const Firebird::Exception&)
{
memset(sqlMatchAny, 0, sizeof(sqlMatchAny));
sqlMatchAnyLength = 0;
}
try
{
sqlMatchOneLength = getConvFromUnicode().convert(
sizeof(SQL_MATCH_1_CHAR), &SQL_MATCH_1_CHAR, sizeof(sqlMatchOne), sqlMatchOne);
}
catch (const Firebird::Exception&)
{
memset(sqlMatchOne, 0, sizeof(sqlMatchOne));
sqlMatchOneLength = 0;
}
}
private:

36
src/common/TextType.cpp
View File

@ -104,10 +104,21 @@ namespace Jrd {
TextType::TextType(TTYPE_ID _type, texttype *_tt, CharSet* _cs)
: tt(_tt), cs(_cs), type(_type)
{
canonical(cs->getSqlMatchAnyLength(), cs->getSqlMatchAny(),
sizeof(ULONG), reinterpret_cast<UCHAR*>(&canonicalChars[CHAR_SQL_MATCH_ANY]));
canonical(cs->getSqlMatchOneLength(), cs->getSqlMatchOne(),
sizeof(ULONG), reinterpret_cast<UCHAR*>(&canonicalChars[CHAR_SQL_MATCH_ONE]));
if (cs->getSqlMatchAnyLength() != 0)
{
canonical(cs->getSqlMatchAnyLength(), cs->getSqlMatchAny(),
sizeof(ULONG), reinterpret_cast<UCHAR*>(&canonicalChars[CHAR_SQL_MATCH_ANY]));
}
else
memset(&canonicalChars[CHAR_SQL_MATCH_ANY], 0, sizeof(ULONG));
if (cs->getSqlMatchOneLength() != 0)
{
canonical(cs->getSqlMatchOneLength(), cs->getSqlMatchOne(),
sizeof(ULONG), reinterpret_cast<UCHAR*>(&canonicalChars[CHAR_SQL_MATCH_ONE]));
}
else
memset(&canonicalChars[CHAR_SQL_MATCH_ONE], 0, sizeof(ULONG));
struct Conversion
{
@ -144,12 +155,19 @@ TextType::TextType(TTYPE_ID _type, texttype *_tt, CharSet* _cs)
for (int i = 0; i < FB_NELEM(conversions); i++)
{
UCHAR temp[sizeof(ULONG)];
try
{
UCHAR temp[sizeof(ULONG)];
ULONG length = getCharSet()->getConvFromUnicode().convert(
sizeof(USHORT), &conversions[i].code, sizeof(temp), temp);
canonical(length, temp, sizeof(ULONG),
reinterpret_cast<UCHAR*>(&canonicalChars[conversions[i].ch]));
ULONG length = getCharSet()->getConvFromUnicode().convert(
sizeof(USHORT), &conversions[i].code, sizeof(temp), temp);
canonical(length, temp, sizeof(ULONG),
reinterpret_cast<UCHAR*>(&canonicalChars[conversions[i].ch]));
}
catch (const Firebird::Exception&)
{
memset(&canonicalChars[conversions[i].ch], 0, sizeof(ULONG));
}
}
struct Conversion2

8
src/jrd/evl_string.h
View File

@ -317,7 +317,9 @@ LikeEvaluator<CharType>::LikeEvaluator(
{
c = pattern_str[pattern_pos++];
/* Note: SQL II says <escape_char><escape_char> is error condition */
if (c == escape_char || c == sql_match_any || c == sql_match_one)
if (c == escape_char ||
(sql_match_any && c == sql_match_any) ||
(sql_match_one && c == sql_match_one))
{
switch (item->type)
{
@ -344,7 +346,7 @@ LikeEvaluator<CharType>::LikeEvaluator(
Firebird::Arg::Gds(isc_escape_invalid).raise();
}
// percent sign
if (c == sql_match_any)
if (sql_match_any && c == sql_match_any)
{
switch (item->type)
{
@ -361,7 +363,7 @@ LikeEvaluator<CharType>::LikeEvaluator(
continue;
}
// underscore
if (c == sql_match_one)
if (sql_match_one && c == sql_match_one)
{
switch (item->type)
{

16
src/jrd/opt.cpp
View File

@ -3344,11 +3344,15 @@ static ValueExprNode* optimize_like(thread_db* tdbb, CompilerScratch* csb, Compa
const BYTE canWidth = matchTextType->getCanonicalWidth();
const UCHAR* matchOneChar = matchCharset->getSqlMatchOneLength() != 0 ?
matchTextType->getCanonicalChar(TextType::CHAR_SQL_MATCH_ONE) : NULL;
const UCHAR* matchAnyChar = matchCharset->getSqlMatchAnyLength() != 0 ?
matchTextType->getCanonicalChar(TextType::CHAR_SQL_MATCH_ANY) : NULL;
// If the first character is a wildcard char, forget it.
if ((!escape_node ||
(memcmp(first_canonic, escape_canonic, canWidth) != 0)) &&
(memcmp(first_canonic, matchTextType->getCanonicalChar(TextType::CHAR_SQL_MATCH_ONE), canWidth) == 0 ||
memcmp(first_canonic, matchTextType->getCanonicalChar(TextType::CHAR_SQL_MATCH_ANY), canWidth) == 0))
if ((!escape_node || memcmp(first_canonic, escape_canonic, canWidth) != 0) &&
((matchOneChar && memcmp(first_canonic, matchOneChar, canWidth) == 0) ||
(matchAnyChar && memcmp(first_canonic, matchAnyChar, canWidth) == 0)))
{
return NULL;
}
@ -3386,8 +3390,8 @@ static ValueExprNode* optimize_like(thread_db* tdbb, CompilerScratch* csb, Compa
patternPtrStart = patternPtr;
patternPtr += canWidth;
}
else if (memcmp(patternPtrStart, matchTextType->getCanonicalChar(TextType::CHAR_SQL_MATCH_ONE), canWidth) == 0 ||
memcmp(patternPtrStart, matchTextType->getCanonicalChar(TextType::CHAR_SQL_MATCH_ANY), canWidth) == 0)
else if ((matchOneChar && memcmp(patternPtrStart, matchOneChar, canWidth) == 0) ||
(matchAnyChar && memcmp(patternPtrStart, matchAnyChar, canWidth) == 0))
{
break;
}