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

Postfix for #7168 - use same logic of errors/warnings of functions in procedures.

Browse Source
This commit is contained in:
Adriano dos Santos Fernandes 2022-04-12 09:34:51 -03:00
parent 7096f67a31
commit 7290d40d81
3 changed files with 44 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/dsql/StmtNodes.cpp
View File

@ -2925,6 +2925,7 @@ DmlNode* ExecProcedureNode::parse(thread_db* tdbb, MemoryPool& pool, CompilerScr
{
SET_TDBB(tdbb);
const auto blrStartPos = csb->csb_blr_reader.getPos();
jrd_prc* procedure = NULL;
QualifiedName name;
@ -2957,6 +2958,25 @@ DmlNode* ExecProcedureNode::parse(thread_db* tdbb, MemoryPool& pool, CompilerScr
if (!procedure)
PAR_error(csb, Arg::Gds(isc_prcnotdef) << Arg::Str(name.toString()));
else
{
if (procedure->isImplemented() && !procedure->isDefined())
{
if (tdbb->getAttachment()->isGbak() || (tdbb->tdbb_flags & TDBB_replicator))
{
PAR_warning(
Arg::Warning(isc_prcnotdef) << Arg::Str(name.toString()) <<
Arg::Warning(isc_modnotfound));
}
else
{
csb->csb_blr_reader.setPos(blrStartPos);
PAR_error(csb,
Arg::Gds(isc_prcnotdef) << Arg::Str(name.toString()) <<
Arg::Gds(isc_modnotfound));
}
}
}
ExecProcedureNode* node = FB_NEW_POOL(pool) ExecProcedureNode(pool);
node->procedure = procedure;
@ -3237,8 +3257,8 @@ void ExecProcedureNode::executeProcedure(thread_db* tdbb, Request* request) cons
else if (!procedure->isDefined())
{
status_exception::raise(
Arg::Gds(isc_prcnotdef) <<
Arg::Str(procedure->getName().toString()));
Arg::Gds(isc_prcnotdef) << Arg::Str(procedure->getName().toString()) <<
Arg::Gds(isc_modnotfound));
}
const_cast<jrd_prc*>(procedure.getObject())->checkReload(tdbb);

20
src/jrd/RecordSourceNodes.cpp
View File

@ -889,6 +889,7 @@ ProcedureSourceNode* ProcedureSourceNode::parse(thread_db* tdbb, CompilerScratch
{
SET_TDBB(tdbb);
const auto blrStartPos = csb->csb_blr_reader.getPos();
jrd_prc* procedure = NULL;
string* aliasString = NULL;
QualifiedName name;
@ -955,6 +956,25 @@ ProcedureSourceNode* ProcedureSourceNode::parse(thread_db* tdbb, CompilerScratch
if (!procedure)
PAR_error(csb, Arg::Gds(isc_prcnotdef) << Arg::Str(name.toString()));
else
{
if (procedure->isImplemented() && !procedure->isDefined())
{
if (tdbb->getAttachment()->isGbak() || (tdbb->tdbb_flags & TDBB_replicator))
{
PAR_warning(
Arg::Warning(isc_prcnotdef) << Arg::Str(name.toString()) <<
Arg::Warning(isc_modnotfound));
}
else
{
csb->csb_blr_reader.setPos(blrStartPos);
PAR_error(csb,
Arg::Gds(isc_prcnotdef) << Arg::Str(name.toString()) <<
Arg::Gds(isc_modnotfound));
}
}
}
if (procedure->prc_type == prc_executable)
{

4
src/jrd/recsrc/ProcedureScan.cpp
View File

@ -66,8 +66,8 @@ void ProcedureScan::open(thread_db* tdbb) const
else if (!m_procedure->isDefined())
{
status_exception::raise(
Arg::Gds(isc_prcnotdef) <<
Arg::Str(m_procedure->getName().toString()));
Arg::Gds(isc_prcnotdef) << Arg::Str(m_procedure->getName().toString()) <<
Arg::Gds(isc_modnotfound));
}
const_cast<jrd_prc*>(m_procedure)->checkReload(tdbb);