Fix problem with COMMENT ON. Thanks Pavel Zotov.

Author: asfernandes

src/dsql/DdlNodes.epp

@@ -1333,7 +1333,7 @@ DdlNode* CommentOnNode::dsqlPass(DsqlCompilerScratch* dsqlScratch)
 		fb_assert(subName.hasData());
 
 		auto nameCopy = name;
-		dsqlScratch->qualifyExistingName(nameCopy, obj_udf);
+		dsqlScratch->resolveRoutineOrRelation(nameCopy, {obj_udf});
 
 		static const CachedRequestId funcCachedHandleId;
 		AutoCacheRequest requestHandle(tdbb, funcCachedHandleId);
@@ -1354,7 +1354,7 @@ DdlNode* CommentOnNode::dsqlPass(DsqlCompilerScratch* dsqlScratch)
 		END_FOR
 
 		nameCopy = name;
-		dsqlScratch->qualifyExistingName(nameCopy, obj_procedure);
+		dsqlScratch->resolveRoutineOrRelation(nameCopy, {obj_procedure});
 
 		static const CachedRequestId procCachedHandleId;
 		requestHandle.reset(tdbb, procCachedHandleId);
@@ -1389,8 +1389,6 @@ DdlNode* CommentOnNode::dsqlPass(DsqlCompilerScratch* dsqlScratch)
 			name = nameCopy;
 	}
 
-	dsqlScratch->ddlSchema = name.schema;
-
 	switch (objType)
 	{
 		case obj_database:
@@ -1400,11 +1398,18 @@ DdlNode* CommentOnNode::dsqlPass(DsqlCompilerScratch* dsqlScratch)
 			fb_assert(name.schema.isEmpty());
 			break;
 
+		case obj_procedure:
+		case obj_udf:
+			dsqlScratch->resolveRoutineOrRelation(name, {objType});
+			break;
+
 		default:
 			dsqlScratch->qualifyExistingName(name, objType);
 			break;
 	}
 
+	dsqlScratch->ddlSchema = name.schema;
+
 	return DdlNode::dsqlPass(dsqlScratch);
 }
 
@@ -1503,8 +1508,7 @@ void CommentOnNode::checkPermission(thread_db* tdbb, jrd_tra* transaction)
 // gives the list of objects that accept descriptions. At FB2 time, the only
 // subobjects with descriptions are relation's fields and procedure's parameters.
 // In FB3 we added function's arguments.
-void CommentOnNode::execute(thread_db* tdbb, DsqlCompilerScratch* dsqlScratch,
-	jrd_tra* transaction)
+void CommentOnNode::execute(thread_db* tdbb, DsqlCompilerScratch* dsqlScratch, jrd_tra* transaction)
 {
 	Attachment* const attachment = transaction->tra_attachment;
 

src/dsql/DdlNodes.h

@@ -351,7 +351,7 @@ class AlterEDSPoolClearNode final : public DdlNode
 class CommentOnNode final : public DdlNode
 {
 public:
-	CommentOnNode(MemoryPool& pool, int aObjType,
+	CommentOnNode(MemoryPool& pool, ObjectType aObjType,
 				const QualifiedName& aName, const MetaName& aSubName,
 				const Firebird::string aText)
 		: DdlNode(pool),
@@ -381,7 +381,7 @@ class CommentOnNode final : public DdlNode
 	}
 
 private:
-	int objType;
+	ObjectType objType;
 	QualifiedName name;
 	MetaName subName;
 	Firebird::string text, str;

src/dsql/parse.y

@@ -6161,9 +6161,9 @@ comment
 		{ $$ = newNode<CommentOnNode>($3, QualifiedName(*$4), "", *$6); }
 	| COMMENT ON COLUMN symbol_ddl_name '.' valid_symbol_name IS ddl_desc
 		{ $$ = newNode<CommentOnNode>(obj_relation, *$4, *$6, *$8); }
-	| COMMENT ON ddl_type3 qualified_name '.' valid_symbol_name IS ddl_desc
+	| COMMENT ON ddl_type3 scoped_qualified_name '.' valid_symbol_name IS ddl_desc
 		{ $$ = newNode<CommentOnNode>($3, *$4, *$6, *$8); }
-	| COMMENT ON ddl_type4 qualified_name IS ddl_desc
+	| COMMENT ON ddl_type4 scoped_qualified_name IS ddl_desc
 		{ $$ = newNode<CommentOnNode>($3, *$4, "", *$6); }
 	| comment_on_user
 		{ $$ = $1; }