Skip to content

Fix removal of function return specification in informix->pg #26

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

Open
strk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix removal of function return specification in informix->pg #26

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 3 additions & 26 deletions sqlparser/statements.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9208,32 +9208,9 @@ bool SqlParser::ParseFunctionReturns(Token *function)
ParseDataType(data_type, SQL_SCOPE_FUNC_PARAMS);
}
else
// RETURNS in SQL Server, DB2, PostgreSQL, MySQL, Informix
if(_source != SQL_INFORMIX && Token::Compare(returns, "RETURNS", L"RETURNS", 7) == true)
{
// Change to RETURN in Oracle
if(_target == SQL_ORACLE)
Token::Change(returns, "RETURN", L"RETURN", 6);

// Return data type
Token *data_type = GetNextToken();

// Check for 'void' data type in PostgreSQL meaning stored procedure
if(Token::Compare(data_type, "VOID", L"VOID", 4) == true)
{
// If not PostgreSQL convert to procedure and remove return clause
if(_target != SQL_POSTGRESQL)
{
Token::Change(function, "PROCEDURE", L"PROCEDURE", 9);
Token::Remove(returns, data_type);
}
}
else
ParseDataType(data_type, SQL_SCOPE_FUNC_PARAMS);
}
else
// RETURNS or RETURNING in Informix
if(Token::Compare(returns, "RETURNING", L"RETURNING", 9) == true)
if(Token::Compare(returns, "RETURNING", L"RETURNING", 9) == true ||
Token::Compare(returns, "RETURNS", L"RETURNS", 7) == true )
{
_spl_returns = returns;

Expand Down Expand Up @@ -10065,4 +10042,4 @@ bool SqlParser::ParseFunctionBody(Token *create, Token *function, Token *name, T
AddGeneratedVariables();

return true;
}
}