Fix problems with fully qualified packaged table's index names

Author: asfernandes

src/dsql/gen.cpp

@@ -523,14 +523,32 @@ static void gen_plan(DsqlCompilerScratch* dsqlScratch, const PlanNode* planNode)
 
 		const auto checkIndexSchema = [&]()
 		{
-			if (node->recordSourceNode &&
-				node->recordSourceNode->dsqlContext &&
-				node->recordSourceNode->dsqlContext->ctx_relation &&
-				idx_iter->indexName.schema.hasData() &&
-				idx_iter->indexName.schema != node->recordSourceNode->dsqlContext->ctx_relation->rel_name.schema)
+			if (!node->recordSourceNode ||
+				!node->recordSourceNode->dsqlContext ||
+				!node->recordSourceNode->dsqlContext->ctx_relation)
 			{
-				ERRD_post(Arg::Gds(isc_index_unused) << idx_iter->indexName.toQuotedString());
+				return;
 			}
+
+			const auto& relName = node->recordSourceNode->dsqlContext->ctx_relation->rel_name;
+			const auto& indexName = idx_iter->indexName;
+
+			if (indexName.package.hasData())
+			{
+				if ((!indexName.schema.hasData() || indexName.schema == relName.schema) &&
+					indexName.package == relName.package)
+				{
+					return;
+				}
+			}
+			else if (!indexName.schema.hasData() ||
+				indexName.schema == relName.schema ||
+				indexName.schema == relName.package)
+			{
+				return;
+			}
+
+			ERRD_post(Arg::Gds(isc_index_unused) << indexName.toQuotedString());
 		};
 
 		switch (node->accessType->type)

src/dsql/parse.y

@@ -7423,7 +7423,7 @@ access_type
 			'(' index_list($2) ')'
 		{ $$ = $2; }
 	| ORDER { $$ = newNode<PlanNode::AccessType>(PlanNode::AccessType::TYPE_NAVIGATIONAL); }
-			symbol_index_name extra_indices_opt($2)
+			scoped_qualified_name extra_indices_opt($2)
 		{
 			$$ = $2;
 			$$->items.insert(0).indexName = *$3;
@@ -7432,12 +7432,12 @@ access_type
 
 %type index_list(<accessType>)
 index_list($accessType)
-	: symbol_index_name
+	: scoped_qualified_name
 		{
 			PlanNode::AccessItem& item = $accessType->items.add();
 			item.indexName = *$1;
 		}
-	| index_list ',' symbol_index_name
+	| index_list ',' scoped_qualified_name
 		{
 			PlanNode::AccessItem& item = $accessType->items.add();
 			item.indexName = *$3;

src/jrd/RecordSourceNodes.cpp

@@ -603,6 +603,41 @@ dsql_ctx* PlanNode::dsqlPassAlias(DsqlCompilerScratch* dsqlScratch, DsqlContextS
 		}
 	}
 
+	if (!result_context && alias.schema.hasData() && alias.package.isEmpty())
+	{
+		// Fallback for packaged relations referenced as package.table: the qualifier
+		// names a package, not a schema. Mirrors the name1.name2 handling in
+		// DsqlCompilerScratch::resolveRoutineOrRelation. Kept local to PLAN matching
+		// so field-qualification semantics elsewhere are unchanged.
+		for (DsqlContextStack::iterator itr(stack); itr.hasData(); ++itr)
+		{
+			dsql_ctx* context = itr.object();
+			if (context->ctx_scope_level != dsqlScratch->scopeLevel)
+				continue;
+
+			if (context->ctx_internal_alias.object.hasData())
+				continue;
+
+			if ((context->ctx_relation &&
+					context->ctx_relation->rel_name.object == alias.object &&
+					context->ctx_relation->rel_name.package == alias.schema) ||
+				(context->ctx_procedure &&
+					context->ctx_procedure->prc_name.object == alias.object &&
+					context->ctx_procedure->prc_name.package == alias.schema))
+			{
+				if (result_context)
+				{
+					// the table %s is referenced twice; use aliases to differentiate
+					ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-104) <<
+							  Arg::Gds(isc_dsql_command_err) <<
+							  Arg::Gds(isc_dsql_self_join) << alias.toQuotedString());
+				}
+
+				result_context = context;
+			}
+		}
+	}
+
 	return result_context;
 }
 

src/jrd/par.cpp

@@ -1185,6 +1185,7 @@ static PlanNode* par_plan(thread_db* tdbb, CompilerScratch* csb)
 				QualifiedName name;
 				csb->csb_blr_reader.getMetaName(name.object);
 				name.schema = relation->rel_name.schema;
+				name.package = relation->rel_name.package;
 
 				IndexStatus idx_status;
 				MetaId foundRelationId;
@@ -1240,6 +1241,7 @@ static PlanNode* par_plan(thread_db* tdbb, CompilerScratch* csb)
 					QualifiedName name;
 					csb->csb_blr_reader.getMetaName(name.object);
 					name.schema = relation->rel_name.schema;
+					name.package = relation->rel_name.package;
 
 					IndexStatus idx_status;
 					MetaId foundRelationId;