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

Postfix for #7566 - Allow DEFAULT keyword in argument list.

Browse Source 
When parameter has no default, use domain's default for TYPE OF or NULL.
This commit is contained in:
Adriano dos Santos Fernandes 2024-01-20 16:29:04 -03:00
parent 676b3be5f8
commit 8224df0278
2 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/dsql/ExprNodes.cpp
View File

@ -13115,9 +13115,11 @@ DmlNode* UdfCallNode::parse(thread_db* tdbb, MemoryPool& pool, CompilerScratch*
for (auto& parameter : node->function->getInputFields())
{
NestConst<Jrd::ValueExprNode>* argValue;
bool argExists = false;
if (parameter->prm_name.hasData())
{
argExists = argsByName.exist(parameter->prm_name);
argValue = argsByName.get(parameter->prm_name);
if (argValue)
@ -13133,6 +13135,28 @@ DmlNode* UdfCallNode::parse(thread_db* tdbb, MemoryPool& pool, CompilerScratch*
{
if (parameter->prm_default_value)
*argIt = CMP_clone_node(tdbb, csb, parameter->prm_default_value);
else if (argExists) // explicit DEFAULT in caller
{
FieldInfo fieldInfo;
if (parameter->prm_mechanism != prm_mech_type_of &&
!fb_utils::implicit_domain(parameter->prm_field_source.c_str()))
{
const MetaNamePair namePair(parameter->prm_field_source, "");
if (!csb->csb_map_field_info.get(namePair, fieldInfo))
{
dsc dummyDesc;
MET_get_domain(tdbb, csb->csb_pool, parameter->prm_field_source, &dummyDesc, &fieldInfo);
csb->csb_map_field_info.put(namePair, fieldInfo);
}
}
if (fieldInfo.defaultValue)
*argIt = CMP_clone_node(tdbb, csb, fieldInfo.defaultValue);
else
*argIt = NullNode::instance();
}
else
mismatchStatus << Arg::Gds(isc_param_no_default_not_specified) << parameter->prm_name;
}

23
src/jrd/cmp.cpp
View File

@ -553,6 +553,7 @@ bool CMP_procedure_arguments(
for (auto& parameter : fields)
{
const auto argValue = argsByName.get(parameter->prm_name);
const bool argExists = argsByName.exist(parameter->prm_name);
if (argValue)
{
@ -566,6 +567,28 @@ bool CMP_procedure_arguments(
{
if (parameter->prm_default_value)
*sourceArgIt = CMP_clone_node(tdbb, csb, parameter->prm_default_value);
else if (argExists) // explicit DEFAULT in caller
{
FieldInfo fieldInfo;
if (parameter->prm_mechanism != prm_mech_type_of &&
!fb_utils::implicit_domain(parameter->prm_field_source.c_str()))
{
const MetaNamePair namePair(parameter->prm_field_source, "");
if (!csb->csb_map_field_info.get(namePair, fieldInfo))
{
dsc dummyDesc;
MET_get_domain(tdbb, csb->csb_pool, parameter->prm_field_source, &dummyDesc, &fieldInfo);
csb->csb_map_field_info.put(namePair, fieldInfo);
}
}
if (fieldInfo.defaultValue)
*sourceArgIt = CMP_clone_node(tdbb, csb, fieldInfo.defaultValue);
else
*sourceArgIt = NullNode::instance();
}
else
mismatchStatus << Arg::Gds(isc_param_no_default_not_specified) << parameter->prm_name;
}