feat: enhance cascading deletion logic to prevent infinite loops and improve foreign key checks

Author: kulikp1

adminforth/dataConnectors/mysql.ts

@@ -87,11 +87,12 @@ class MysqlConnector extends AdminForthBaseConnector implements IAdminForthDataS
       SELECT 1
       FROM information_schema.REFERENTIAL_CONSTRAINTS
       WHERE CONSTRAINT_SCHEMA = DATABASE()
+        AND TABLE_NAME = ?
         AND REFERENCED_TABLE_NAME = ?
         AND DELETE_RULE = 'CASCADE'
       LIMIT 1
       `,
-      [parentResource.table]
+      [resource.table, parentResource.table]
     );
 
     const hasCascadeOnTable = (rows as any[]).length > 0;
@@ -101,6 +102,7 @@ class MysqlConnector extends AdminForthBaseConnector implements IAdminForthDataS
     if (hasCascadeOnTable && isUploadPluginInstalled) {
       afLogger.warn(`Table "${resource.table}" has ON DELETE CASCADE and UploadPlugin installed, which may conflict with adminForth cascade deletion`);
     }
+    return hasCascadeOnTable;
   }
 
   async discoverFields(resource: AdminForthResource, config: AdminForthConfig) {

adminforth/dataConnectors/postgres.ts

@@ -69,7 +69,7 @@ class PostgresConnector extends AdminForthBaseConnector implements IAdminForthDa
         return res.rows.map(row => ({ name: row.column_name, sampleValue: sampleRow[row.column_name] }));
       }
 
-    async checkForeignResourceCascade(resource: AdminForthResource, config: AdminForthConfig, schema = 'public'): Promise<boolean> {
+    async checkForeignResourceCascade(resource: AdminForthResource, config: AdminForthConfig, schema = 'public'): Promise<void> {
         const cascadeColumn = resource.columns.find(c => c.foreignResource?.onDelete === 'cascade');
         if (!cascadeColumn) return;
 
@@ -81,11 +81,12 @@ class PostgresConnector extends AdminForthBaseConnector implements IAdminForthDa
             SELECT 1
             FROM pg_constraint
             WHERE contype = 'f'
-            AND confrelid = ($2 || '.' || $1)::regclass
-            AND confdeltype = 'c'
+                AND confrelid = ($2 || '.' || $1)::regclass
+                AND conrelid = ($2 || '.' || $3)::regclass
+                AND confdeltype = 'c'
             LIMIT 1
-            `,
-            [parentResource.table, schema]
+                    `,
+            [parentResource.table, schema, resource.table ]
         );
 
         const hasCascadeOnTable = res.rowCount > 0;

adminforth/modules/configValidator.ts

@@ -31,7 +31,6 @@ import AdminForth from "adminforth";
 import { AdminForthConfigMenuItem } from "adminforth";
 import { afLogger } from "./logger.js";
 import {cascadeChildrenDelete} from './utils.js'
-import AdminForthRestAPI from './restApi.js';
 
 export default class ConfigValidator implements IConfigValidator {
 
@@ -283,8 +282,8 @@ export default class ConfigValidator implements IConfigValidator {
               return;
             }
 
-            await connector.deleteRecord({ resource: res as AdminForthResource, recordId });
             await cascadeChildrenDelete(res as AdminForthResource, recordId, { adminUser, response}, this.adminforth);
+            await connector.deleteRecord({ resource: res as AdminForthResource, recordId });
 
             await Promise.all(
               (res.hooks.delete.afterSave).map(

adminforth/modules/utils.ts

@@ -480,9 +480,15 @@ export function slugifyString(str: string): string {
     .replace(/[^a-z0-9-_]/g, '-');
 }
 
-export async function cascadeChildrenDelete(resource: AdminForthResource, primaryKey: string, context: {adminUser: any, response: any}, adminforth: IAdminForth): Promise<{ error: string | null }> {
+export async function cascadeChildrenDelete(resource: AdminForthResource, primaryKey: string, context: {adminUser: any, response: any}, adminforth: IAdminForth, visitedResources: Set<string> = new Set()): Promise<{ error: string | null }> {
     const { adminUser, response } = context;
 
+    if (visitedResources.has(resource.resourceId)) {
+      return { error: null };
+    }
+
+    visitedResources.add(resource.resourceId);
+
     const childResources = adminforth.config.resources.filter(r =>r.columns.some(c => c.foreignResource?.resourceId === resource.resourceId));
 
     for (const childRes of childResources) {
@@ -495,11 +501,13 @@ export async function cascadeChildrenDelete(resource: AdminForthResource, primar
       const childRecords = await adminforth.resource(childRes.resourceId).list(Filters.EQ(foreignColumn.name, primaryKey));
 
       const childPk = childRes.columns.find(c => c.primaryKey)?.name;
-      if (!childPk) continue;
 
       if (strategy === 'cascade') {
         for (const childRecord of childRecords) {
-          const childResult = await cascadeChildrenDelete(childRes, childRecord[childPk], context, adminforth);
+          const childResult = await cascadeChildrenDelete(childRes, childRecord[childPk], context, adminforth, visitedResources);
+          if (childResult?.error) {
+            return childResult;
+          }
           const deleteChild = await adminforth.deleteResourceRecord({resource: childRes, record: childRecord, adminUser, recordId: childRecord[childPk], response});
           if (deleteChild.error) return { error: deleteChild.error };
           if (childResult?.error) {