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

Fixed CORE-4237 - FB3 vs FB2.5. Different metadata for UDF return argument.

Browse Source 
The is a case showing a difference between 2.5 and 3.0 in the first comment. The second comment does not show difference between versions.
This commit is contained in:
asfernandes 2013-10-04 15:58:03 +00:00
parent f5bbe3701c
commit 5296e616d3
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/dsql/DdlNodes.epp
View File

@ -1666,7 +1666,7 @@ bool CreateAlterFunctionNode::executeAlter(thread_db* tdbb, DsqlCompilerScratch*
// and insert the new ones // and insert the new ones
if (returnType && returnType->type) if (returnType && returnType->type)
storeArgument(tdbb, dsqlScratch, transaction, returnPos, returnType, NULL); storeArgument(tdbb, dsqlScratch, transaction, returnPos, true, returnType, NULL);
for (size_t i = 0; i < parameters.getCount(); ++i) for (size_t i = 0; i < parameters.getCount(); ++i)
{ {
@ -1677,7 +1677,7 @@ bool CreateAlterFunctionNode::executeAlter(thread_db* tdbb, DsqlCompilerScratch*
if (!comments.get(parameter->name, comment)) if (!comments.get(parameter->name, comment))
comment.clear(); comment.clear();
storeArgument(tdbb, dsqlScratch, transaction, i + 1, parameter, &comment); storeArgument(tdbb, dsqlScratch, transaction, i + 1, false, parameter, &comment);
} }
} }
@ -1685,7 +1685,7 @@ bool CreateAlterFunctionNode::executeAlter(thread_db* tdbb, DsqlCompilerScratch*
} }
void CreateAlterFunctionNode::storeArgument(thread_db* tdbb, DsqlCompilerScratch* dsqlScratch, void CreateAlterFunctionNode::storeArgument(thread_db* tdbb, DsqlCompilerScratch* dsqlScratch,
jrd_tra* transaction, unsigned pos, ParameterClause* parameter, jrd_tra* transaction, unsigned pos, bool returnArg, ParameterClause* parameter,
const bid* comment) const bid* comment)
{ {
Attachment* const attachment = transaction->getAttachment(); Attachment* const attachment = transaction->getAttachment();
@ -1828,8 +1828,8 @@ void CreateAlterFunctionNode::storeArgument(thread_db* tdbb, DsqlCompilerScratch
{ {
ARG.RDB$MECHANISM.NULL = FALSE; ARG.RDB$MECHANISM.NULL = FALSE;
if (pos == 0 && // CVC: This is case of "returns <type> [by value|reference]" if (returnArg && // CVC: This is case of "returns <type> [by value|reference]"
type->dtype == dtype_blob) udfReturnPos == 0 && type->dtype == dtype_blob)
{ {
// CVC: I need to test returning blobs by descriptor before allowing the // CVC: I need to test returning blobs by descriptor before allowing the
// change there. For now, I ignore the return type specification. // change there. For now, I ignore the return type specification.

2
src/dsql/DdlNodes.h
View File

@ -298,7 +298,7 @@ private:
bool secondPass, bool runTriggers); bool secondPass, bool runTriggers);
void storeArgument(thread_db* tdbb, DsqlCompilerScratch* dsqlScratch, jrd_tra* transaction, void storeArgument(thread_db* tdbb, DsqlCompilerScratch* dsqlScratch, jrd_tra* transaction,
unsigned pos, ParameterClause* parameter, const bid* comment); unsigned pos, bool returnArg, ParameterClause* parameter, const bid* comment);
void compile(thread_db* tdbb, DsqlCompilerScratch* dsqlScratch); void compile(thread_db* tdbb, DsqlCompilerScratch* dsqlScratch);
void collectParamComments(thread_db* tdbb, jrd_tra* transaction, MetaNameBidMap& items); void collectParamComments(thread_db* tdbb, jrd_tra* transaction, MetaNameBidMap& items);