Fix #8599 - isc_info_sql_relation_alias should not report a quoted alias.

Author: asfernandes

src/dsql/ExprNodes.cpp

@@ -8916,7 +8916,7 @@ void DerivedFieldNode::setParameterName(dsql_par* parameter) const
 	value->setParameterName(parameter);
 
 	parameter->par_alias = name;
-	parameter->par_rel_alias = context->getConcatenatedAlias();
+	parameter->par_rel_alias = context->ctx_alias.hasData() ? context->ctx_alias.front().object : MetaName();
 }
 
 void DerivedFieldNode::genBlr(DsqlCompilerScratch* dsqlScratch)
@@ -14593,7 +14593,7 @@ static void setParameterInfo(dsql_par* parameter, const dsql_ctx* context)
 		parameter->par_owner_name = context->ctx_procedure->prc_owner;
 	}
 
-	parameter->par_rel_alias = context->getConcatenatedAlias();
+	parameter->par_rel_alias = context->ctx_alias.hasData() ? context->ctx_alias.front().object : MetaName();
 }
 
 

src/dsql/dsql.cpp

@@ -1284,9 +1284,9 @@ static UCHAR* var_info(const dsql_msg* message,
 				case isc_info_sql_relation_alias:
 					if (param->par_rel_alias.hasData())
 					{
-						str = attachment->stringToUserCharSet(tdbb, param->par_rel_alias);
-						length = str.length();
-						buffer = reinterpret_cast<const UCHAR*>(str.c_str());
+						name = attachment->nameToUserCharSet(tdbb, param->par_rel_alias);
+						length = name.length();
+						buffer = reinterpret_cast<const UCHAR*>(name.c_str());
 					}
 					else
 						length = 0;

src/dsql/dsql.h

@@ -601,7 +601,7 @@ class dsql_par : public Firebird::PermanentStorage
 	MetaName par_name;					// Parameter name, if any
 	QualifiedName par_rel_name;			// Relation name, if any
 	MetaName par_owner_name;			// Owner name, if any
-	Firebird::string par_rel_alias;		// Relation alias, if any
+	MetaName par_rel_alias;				// Relation alias, if any
 	MetaName par_alias;					// Alias, if any
 	dsc par_desc;						// Field data type
 	USHORT par_parameter = 0;			// BLR parameter number

src/dsql/make.cpp

@@ -532,8 +532,8 @@ dsql_par* MAKE_parameter(dsql_msg* message, bool sqlda_flag, bool null_flag,
 	parameter->par_parameter = message->msg_parameter++;
 
 	parameter->par_rel_name.clear();
-	parameter->par_owner_name = NULL;
-	parameter->par_rel_alias.clear();
+	parameter->par_owner_name = nullptr;
+	parameter->par_rel_alias = nullptr;
 
 	if (node)
 		MAKE_parameter_names(parameter, node);