Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FB4] Proposal for fixing #7877 - disable an usage of SCALAR_ARRAY with BLOB datatype #7878

Open
wants to merge 2 commits into
base: v4.0-release
Choose a base branch
from
Open

[FB4] Proposal for fixing #7877 - disable an usage of SCALAR_ARRAY with BLOB datatype #7878

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7251e44
Proposal for fixing #7877 - disable an usage of SCALAR_ARRAY with BLO…
dmitry-lipetsk Nov 26, 2023
17faf1c
The mistake with a check of udfReturnPos was fixed
dmitry-lipetsk Nov 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 74 additions & 23 deletions src/dsql/DdlNodes.epp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1631,6 +1631,40 @@ DdlNode* CreateAlterFunctionNode::dsqlPass(DsqlCompilerScratch* dsqlScratch)
{
dsqlScratch->flags |= (DsqlCompilerScratch::FLAG_BLOCK | DsqlCompilerScratch::FLAG_FUNCTION);

if (this->isUdf())
{
// check udfReturnPos
const dsql_fld* const field = this->returnType ? this->returnType->type : NULL;

if (field)
{
// CVC: This is case of "returns <type> [by value|reference]".
fb_assert(udfReturnPos == 0);
}
else
{
// CVC: This is case of "returns parameter <N>"

// see return_value in parser
fb_assert(udfReturnPos > 0);

if (udfReturnPos < 1 || ULONG(udfReturnPos) > parameters.getCount())
{
// CVC: We should devise new msg "position should be between 1 and #params";
// here it is: dsql_udf_return_pos_err

// External functions can not have more than 10 parameters
// Not strictly correct -- return position error
status_exception::raise(
Arg::Gds(isc_sqlerr) << Arg::Num(-607) <<
Arg::Gds(isc_dsql_command_err) << // gds__extern_func_err
Arg::Gds(isc_dsql_udf_return_pos_err) << Arg::Num(parameters.getCount()));
}
}

fb_assert(udfReturnPos >= 0 && ULONG(udfReturnPos) <= parameters.getCount());
}

// check for duplicated parameters and declaration names

StrArray names;
Expand Down Expand Up @@ -1681,6 +1715,42 @@ DdlNode* CreateAlterFunctionNode::dsqlPass(DsqlCompilerScratch* dsqlScratch)
if (returnType && returnType->type)
returnType->type->resolve(dsqlScratch);

// check UDF argument types
if (this->isUdf())
{
for (FB_SIZE_T i = 0; i < parameters.getCount(); ++i)
{
ParameterClause* const parameter = parameters[i];

if (this->udfReturnPos == (i + 1))
{
// It is a parameter that is marked as RETURN

// We'll verify that SCALAR_ARRAY can't be used as a return type.
// The support for SCALAR_ARRAY is only for input parameters.
if (parameter->udfMechanism == FUN_scalar_array)
{
status_exception::raise(
Arg::Gds(isc_sqlerr) << Arg::Num(-607) <<
Arg::Gds(isc_dsql_command_err) <<
Arg::Gds(isc_random) << "BY SCALAR_ARRAY can't be used as a return parameter");
}
continue;
}

// It is an input argument

if (parameter->udfMechanism == FUN_scalar_array &&
parameter->type->dtype == dtype_blob)
{
status_exception::raise(
Arg::Gds(isc_sqlerr) << Arg::Num(-607) <<
Arg::Gds(isc_dsql_command_err) <<
Arg::Gds(isc_random) << "BY SCALAR_ARRAY can't be used with BLOB datatype");
}
}
}

// check SQL SECURITY is not set if function declared in package
if (package.hasData() && ssDefiner.specified)
{
Expand Down Expand Up @@ -1938,31 +2008,12 @@ bool CreateAlterFunctionNode::executeAlter(thread_db* tdbb, DsqlCompilerScratch*
else // CVC: This is case of "returns parameter <N>"
{
// Function modifies an argument whose value is the function return value.
// It was checked in CreateAlterFunctionNode::dsqlPass
fb_assert(!(udfReturnPos < 1 || ULONG(udfReturnPos) > parameters.getCount()));

if (udfReturnPos < 1 || ULONG(udfReturnPos) > parameters.getCount())
{
// CVC: We should devise new msg "position should be between 1 and #params";
// here it is: dsql_udf_return_pos_err

// External functions can not have more than 10 parameters
// Not strictly correct -- return position error
status_exception::raise(
Arg::Gds(isc_sqlerr) << Arg::Num(-607) <<
Arg::Gds(isc_dsql_command_err) << // gds__extern_func_err
Arg::Gds(isc_dsql_udf_return_pos_err) << Arg::Num(parameters.getCount()));
}

// We'll verify that SCALAR_ARRAY can't be used as a return type.
// The support for SCALAR_ARRAY is only for input parameters.

if (parameters[udfReturnPos - 1]->udfMechanism.specified &&
parameters[udfReturnPos - 1]->udfMechanism.value == FUN_scalar_array)
{
status_exception::raise(
Arg::Gds(isc_sqlerr) << Arg::Num(-607) <<
Arg::Gds(isc_dsql_command_err) <<
Arg::Gds(isc_random) << "BY SCALAR_ARRAY can't be used as a return parameter");
}
// It was checked in CreateAlterFunctionNode::dsqlPass
fb_assert(!(parameters[udfReturnPos - 1]->udfMechanism == FUN_scalar_array));

FUN.RDB$RETURN_ARGUMENT = (SSHORT) udfReturnPos;
}
Expand Down