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

Fix #7831. Wrong parameter type for SCALAR_ARRAY argument. (#7836)

Browse Source 
* METD_get_function respects FUN_scalar_array to build correct DSC of arguments.

It resolves the issue #7831 and forces a server to use SQL_ARRAY datatype for scalar_array-parameters.

* The code style has been corrected. I'm sorry.
This commit is contained in:
Dmitry Kovalenko 2023-11-10 11:12:03 +03:00 committed by Dmitry Yemanov
parent 9e3f040600
commit f60493c43b
1 changed files with 86 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

146
src/dsql/metd.epp
View File

@ -730,39 +730,52 @@ dsql_udf* METD_get_function(jrd_tra* transaction, DsqlCompilerScratch* dsqlScrat
else else
{ {
DSC d; DSC d;
d.dsc_dtype = (F.RDB$FIELD_TYPE != blr_blob) ?
gds_cvt_blr_dtype[F.RDB$FIELD_TYPE] : dtype_blob; if (X.RDB$MECHANISM == FUN_scalar_array)
// dimitr: adjust the UDF arguments for CSTRING {
if (d.dsc_dtype == dtype_cstring) { d.dsc_dtype = dtype_array;
d.dsc_dtype = dtype_text; d.dsc_scale = 0;
}
d.dsc_scale = F.RDB$FIELD_SCALE;
if (!F.RDB$FIELD_SUB_TYPE.NULL) {
d.dsc_sub_type = F.RDB$FIELD_SUB_TYPE;
}
else {
d.dsc_sub_type = 0; d.dsc_sub_type = 0;
} d.dsc_length = sizeof(ISC_QUAD);
d.dsc_length = F.RDB$FIELD_LENGTH;
if (d.dsc_dtype == dtype_varying) {
d.dsc_length += sizeof(USHORT);
}
d.dsc_address = NULL;
if (!F.RDB$CHARACTER_SET_ID.NULL)
{
if (d.dsc_dtype != dtype_blob) {
d.dsc_ttype() = F.RDB$CHARACTER_SET_ID;
}
else {
d.dsc_scale = F.RDB$CHARACTER_SET_ID;
}
}
if (X.RDB$MECHANISM != FUN_value && X.RDB$MECHANISM != FUN_reference)
{
d.dsc_flags = DSC_nullable; d.dsc_flags = DSC_nullable;
} }
else
{
d.dsc_dtype = (F.RDB$FIELD_TYPE != blr_blob) ?
gds_cvt_blr_dtype[F.RDB$FIELD_TYPE] : dtype_blob;
// dimitr: adjust the UDF arguments for CSTRING
if (d.dsc_dtype == dtype_cstring) {
d.dsc_dtype = dtype_text;
}
d.dsc_scale = F.RDB$FIELD_SCALE;
if (!F.RDB$FIELD_SUB_TYPE.NULL) {
d.dsc_sub_type = F.RDB$FIELD_SUB_TYPE;
}
else {
d.dsc_sub_type = 0;
}
d.dsc_length = F.RDB$FIELD_LENGTH;
if (d.dsc_dtype == dtype_varying) {
d.dsc_length += sizeof(USHORT);
}
if (!F.RDB$CHARACTER_SET_ID.NULL)
{
if (d.dsc_dtype != dtype_blob) {
d.dsc_ttype() = F.RDB$CHARACTER_SET_ID;
}
else {
d.dsc_scale = F.RDB$CHARACTER_SET_ID;
}
}
if (X.RDB$MECHANISM != FUN_value && X.RDB$MECHANISM != FUN_reference)
{
d.dsc_flags = DSC_nullable;
}
}
d.dsc_address = NULL;
if (!X.RDB$DEFAULT_VALUE.NULL || if (!X.RDB$DEFAULT_VALUE.NULL ||
(fb_utils::implicit_domain(F.RDB$FIELD_NAME) && !F.RDB$DEFAULT_VALUE.NULL)) (fb_utils::implicit_domain(F.RDB$FIELD_NAME) && !F.RDB$DEFAULT_VALUE.NULL))
@ -805,39 +818,52 @@ dsql_udf* METD_get_function(jrd_tra* transaction, DsqlCompilerScratch* dsqlScrat
else else
{ {
DSC d; DSC d;
d.dsc_dtype = (X.RDB$FIELD_TYPE != blr_blob) ?
gds_cvt_blr_dtype[X.RDB$FIELD_TYPE] : dtype_blob; if (X.RDB$MECHANISM == FUN_scalar_array)
// dimitr: adjust the UDF arguments for CSTRING {
if (d.dsc_dtype == dtype_cstring) { d.dsc_dtype = dtype_array;
d.dsc_dtype = dtype_text; d.dsc_scale = 0;
}
d.dsc_scale = X.RDB$FIELD_SCALE;
if (!X.RDB$FIELD_SUB_TYPE.NULL) {
d.dsc_sub_type = X.RDB$FIELD_SUB_TYPE;
}
else {
d.dsc_sub_type = 0; d.dsc_sub_type = 0;
} d.dsc_length = sizeof(ISC_QUAD);
d.dsc_length = X.RDB$FIELD_LENGTH;
if (d.dsc_dtype == dtype_varying) {
d.dsc_length += sizeof(USHORT);
}
d.dsc_address = NULL;
if (!X.RDB$CHARACTER_SET_ID.NULL)
{
if (d.dsc_dtype != dtype_blob) {
d.dsc_ttype() = X.RDB$CHARACTER_SET_ID;
}
else {
d.dsc_scale = X.RDB$CHARACTER_SET_ID;
}
}
if (X.RDB$MECHANISM != FUN_value && X.RDB$MECHANISM != FUN_reference)
{
d.dsc_flags = DSC_nullable; d.dsc_flags = DSC_nullable;
} }
else
{
d.dsc_dtype = (X.RDB$FIELD_TYPE != blr_blob) ?
gds_cvt_blr_dtype[X.RDB$FIELD_TYPE] : dtype_blob;
// dimitr: adjust the UDF arguments for CSTRING
if (d.dsc_dtype == dtype_cstring) {
d.dsc_dtype = dtype_text;
}
d.dsc_scale = X.RDB$FIELD_SCALE;
if (!X.RDB$FIELD_SUB_TYPE.NULL) {
d.dsc_sub_type = X.RDB$FIELD_SUB_TYPE;
}
else {
d.dsc_sub_type = 0;
}
d.dsc_length = X.RDB$FIELD_LENGTH;
if (d.dsc_dtype == dtype_varying) {
d.dsc_length += sizeof(USHORT);
}
if (!X.RDB$CHARACTER_SET_ID.NULL)
{
if (d.dsc_dtype != dtype_blob) {
d.dsc_ttype() = X.RDB$CHARACTER_SET_ID;
}
else {
d.dsc_scale = X.RDB$CHARACTER_SET_ID;
}
}
if (X.RDB$MECHANISM != FUN_value && X.RDB$MECHANISM != FUN_reference)
{
d.dsc_flags = DSC_nullable;
}
}
d.dsc_address = NULL;
if (!X.RDB$DEFAULT_VALUE.NULL) if (!X.RDB$DEFAULT_VALUE.NULL)
{ {