Fixed control on index dependencies when index to be deleted

Author: AlexPeshkoff

src/dsql/DdlNodes.epp

@@ -14407,7 +14407,27 @@ void DropIndexNode::drop(thread_db* tdbb, DsqlCompilerScratch* dsqlScratch, jrd_
 				IDX.RDB$INDEX_INACTIVE = MET_index_deferred_drop;
 
 				if (tempName.hasData())
+				{
 					strcpy(IDX.RDB$INDEX_NAME, tempName.c_str());
+
+					// Related dependencies should be also renamed
+					AUTO_HANDLE(depRq);
+					FOR(REQUEST_HANDLE depRq TRANSACTION_HANDLE transaction)
+						DEP IN RDB$DEPENDENCIES
+						WITH DEP.RDB$DEPENDENT_SCHEMA_NAME EQ indexName.schema.c_str() AND
+			 				 DEP.RDB$PACKAGE_NAME EQUIV NULLIF(indexName.package.c_str(), '') AND
+							 DEP.RDB$DEPENDENT_NAME EQ indexName.object.c_str() AND
+							 (DEP.RDB$DEPENDENT_TYPE EQ obj_index_expression OR
+							  DEP.RDB$DEPENDENT_TYPE EQ obj_index_condition)
+					{
+						MODIFY DEP USING
+						{
+							strcpy(DEP.RDB$DEPENDENT_NAME, tempName.c_str());
+						}
+						END_MODIFY
+					}
+					END_FOR
+				}
 			END_MODIFY
 		}
 		else

src/jrd/SystemTriggers.epp

@@ -1732,6 +1732,40 @@ void afterInsertCollation(thread_db* tdbb, Record* record)
 	populateCache<f_coll_cs_id, Cached::CharSet, CSetId>(tdbb, record);
 }
 
+void afterDeleteIndex(thread_db* tdbb, Record* record)
+{
+	const auto transaction = tdbb->getTransaction();
+	dsc desc;
+
+	MetaName schemaName, packageName, indexName;
+
+	if (!EVL_field(nullptr, record, f_idx_schema, &desc))
+		return;
+	MOV_get_metaname(tdbb, &desc, schemaName);
+
+	if (EVL_field(nullptr, record, f_idx_pkg_name, &desc))
+		MOV_get_metaname(tdbb, &desc, packageName);
+
+	if (!EVL_field(nullptr, record, f_idx_name, &desc))
+		return;
+	MOV_get_metaname(tdbb, &desc, indexName);
+
+	static const CachedRequestId requestCacheId;
+	AutoCacheRequest request(tdbb, requestCacheId);
+
+	FOR (REQUEST_HANDLE request TRANSACTION_HANDLE transaction)
+		DEP IN RDB$DEPENDENCIES
+		WITH DEP.RDB$DEPENDENT_SCHEMA_NAME EQ schemaName.c_str() AND
+			 DEP.RDB$PACKAGE_NAME EQUIV NULLIF(packageName.c_str(), '') AND
+			 DEP.RDB$DEPENDENT_NAME EQ indexName.c_str() AND
+			 (DEP.RDB$DEPENDENT_TYPE EQ obj_index_expression OR
+			  DEP.RDB$DEPENDENT_TYPE EQ obj_index_condition)
+	{
+		ERASE DEP;
+	}
+	END_FOR
+}
+
 }	// anonymous
 
 
@@ -1780,6 +1814,10 @@ void SystemTriggers::executeAfterDeleteTriggers(thread_db* tdbb, jrd_rel* relati
 		case rel_rfr:
 			afterDeleteRelationField(tdbb, record);
 			break;
+
+		case rel_indices:
+			afterDeleteIndex(tdbb, record);
+			break;
 	}
 }
 

src/jrd/dfw.epp

@@ -3687,8 +3687,6 @@ static bool delete_index(thread_db* tdbb, SSHORT phase, DeferredWork* work, jrd_
 				}
 			}
 		}
-		MET_delete_dependencies(tdbb, work->getQualifiedName(), obj_index_expression);
-		MET_delete_dependencies(tdbb, work->getQualifiedName(), obj_index_condition);
 		return true;
 
 	case 5: