Merge pull request #28525 from backstage/blam/remove-things

catalog: small query improvement
2025-01-16 13:53:28 +01:00
parent 8467532fa2 3c51a16237
commit c0a8a92136
1 changed files with 5 additions and 6 deletions
@@ -162,12 +162,6 @@ export class DefaultProviderDatabase implements ProviderDatabase {
              logger: this.options.logger,
            });
          }
-
-          await tx<DbRefreshStateReferencesRow>('refresh_state_references')
-            .where('target_entity_ref', entityRef)
-            .andWhere({ source_key: options.sourceKey })
-            .delete();
-
          if (ok) {
            await tx<DbRefreshStateReferencesRow>('refresh_state_references')
              .where('target_entity_ref', entityRef)
@@ -180,6 +174,11 @@ export class DefaultProviderDatabase implements ProviderDatabase {
              target_entity_ref: entityRef,
            });
          } else {
+            await tx<DbRefreshStateReferencesRow>('refresh_state_references')
+              .where('target_entity_ref', entityRef)
+              .andWhere({ source_key: options.sourceKey })
+              .delete();
+
            const conflictingKey = await checkLocationKeyConflict({
              tx,
              entityRef,