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

Fix for #7730: Server ignores the size of VARCHAR when performing SET BIND ... TO VARCHAR(N)

Browse Source 
(cherry picked from commit c60633166c)
This commit is contained in:
AlexPeshkoff 2023-08-29 19:20:37 +03:00
parent fdd5e39bba
commit f88a9f173a
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/jrd/Coercion.cpp
View File

@ -337,13 +337,16 @@ bool CoercionRule::coerce(thread_db* tdbb, dsc* d) const
subTypeCompatibility[d->dsc_dtype] != COMPATIBLE_INT ||
subTypeCompatibility[toDsc.dsc_dtype] != COMPATIBLE_INT)
{
if (!type_lengths[toDsc.dsc_dtype])
if (!(toMask & FLD_has_len))
{
fb_assert(toDsc.isText());
d->dsc_length = d->getStringLength();
if (!type_lengths[toDsc.dsc_dtype])
{
fb_assert(toDsc.isText());
d->dsc_length = d->getStringLength();
}
else
d->dsc_length = type_lengths[toDsc.dsc_dtype];
}
else
d->dsc_length = type_lengths[toDsc.dsc_dtype];
d->dsc_dtype = toDsc.dsc_dtype;
}
@ -356,7 +359,7 @@ bool CoercionRule::coerce(thread_db* tdbb, dsc* d) const
d->dsc_length = DataTypeUtil(tdbb).convertLength(d->dsc_length, srcCharSet, toDsc.getCharSet());
// varchar length
if (d->dsc_dtype == dtype_varying)
if (d->dsc_dtype == dtype_varying && !(toMask & FLD_has_len))
d->dsc_length += sizeof(USHORT);
// subtype - special processing for BLOBs