fix: change check for cascade and upload plugin

Author: kulikp1

adminforth/dataConnectors/baseConnector.ts

@@ -507,17 +507,6 @@ export default class AdminForthBaseConnector implements IAdminForthDataSourceCon
     return result;
   }
 
-  async checkCascadeWhenUploadPlugin(resource: AdminForthResource, config: AdminForthConfig) {
-    const currentResource = config.resources.find(r => r.resourceId === resource.resourceId);
-    if (!currentResource) return;
-      const hasUploadPlugin = currentResource.plugins?.some(p => p.className === "UploadPlugin");
-      
-    if (hasUploadPlugin) {
-      const tableName = (resource.table);
-      afLogger.warn(`Table "${tableName}" has ON DELETE CASCADE, which may conflict with adminForth UploadPlugin.`);
-    }
-  }
-
   getRecordByPrimaryKey(resource: AdminForthResource, recordId: string): Promise<any> {
     return this.getRecordByPrimaryKeyWithOriginalTypes(resource, recordId).then((record) => {
         const newRecord = {};

adminforth/dataConnectors/mysql.ts

@@ -80,7 +80,6 @@ class MysqlConnector extends AdminForthBaseConnector implements IAdminForthDataS
     if (!cascadeColumn) return false;
 
     const parentResource = config.resources.find(r => r.resourceId === cascadeColumn.foreignResource.resourceId);
-
     if (!parentResource) return false;
 
     const [rows] = await this.client.execute(
@@ -95,18 +94,16 @@ class MysqlConnector extends AdminForthBaseConnector implements IAdminForthDataS
       [parentResource.table]
     );
 
-    const hasCascade = (rows as any[]).length > 0;
+    const hasCascadeOnTable = (rows as any[]).length > 0;
+
+    const isUploadPluginInstalled = resource.plugins?.some(p => p.className === "UploadPlugin");
 
-    if (hasCascade) {
-      afLogger.warn(`Table "${parentResource.table}" has ON DELETE CASCADE, which may conflict with adminForth cascade deletion.`);
+    if (hasCascadeOnTable && isUploadPluginInstalled) {
+      afLogger.warn(`Table "${resource.table}" has ON DELETE CASCADE and UploadPlugin installed, which may conflict with adminForth cascade deletion`);
     }
-    
-    return hasCascade;
   }
 
   async discoverFields(resource: AdminForthResource, config: AdminForthConfig) {
-    await this.checkCascadeWhenUploadPlugin(resource, config);
-
     const [results] = await this.client.execute("SHOW COLUMNS FROM " + resource.table);
     await this.hasMySQLCascadeFk(resource, config);
     const fieldTypes = {};

adminforth/dataConnectors/postgres.ts

@@ -71,9 +71,11 @@ class PostgresConnector extends AdminForthBaseConnector implements IAdminForthDa
 
     async checkForeignResourceCascade(resource: AdminForthResource, config: AdminForthConfig, schema = 'public'): Promise<boolean> {
         const cascadeColumn = resource.columns.find(c => c.foreignResource?.onDelete === 'cascade');
-        if (!cascadeColumn) return; 
+        if (!cascadeColumn) return;
 
         const parentResource = config.resources.find(r => r.resourceId === cascadeColumn.foreignResource.resourceId);
+        if (!parentResource) return;
+
         const res = await this.client.query(
             `
             SELECT 1
@@ -86,19 +88,16 @@ class PostgresConnector extends AdminForthBaseConnector implements IAdminForthDa
             [parentResource.table, schema]
         );
 
-        const hasCascade = res.rowCount > 0;
-        if (hasCascade) {
-            afLogger.warn(
-                `Table "${parentResource.table}" has ON DELETE CASCADE, which may conflict with adminForth cascade deletion`
-            );
-        }
+        const hasCascadeOnTable = res.rowCount > 0;
+        const isUploadPluginInstalled = resource.plugins?.some(p => p.className === "UploadPlugin");
 
-        return hasCascade;
+        if (hasCascadeOnTable && isUploadPluginInstalled) {
+            afLogger.warn(`Table "${resource.table}" has ON DELETE CASCADE and installed upload plugin, which may conflict with adminForth cascade deletion`);
+        }
     }
 
     async discoverFields(resource: AdminForthResource, config: AdminForthConfig) {
         await this.checkForeignResourceCascade(resource, config);
-        await this.checkCascadeWhenUploadPlugin(resource, config);
 
         const tableName = resource.table;
         const stmt = await this.client.query(`

adminforth/dataConnectors/sqlite.ts

@@ -38,35 +38,34 @@ class SQLiteConnector extends AdminForthBaseConnector implements IAdminForthData
     }));
   }
 
-    async hasSQLiteCascadeFk(resource: AdminForthResource, config: AdminForthConfig, fkMap: { [colName: string]: boolean }): Promise<boolean> {
+    async hasSQLiteCascadeFk(resource: AdminForthResource, config: AdminForthConfig): Promise<boolean> {
+      const cascadeColumn = resource.columns?.find(c => c.foreignResource?.onDelete === 'cascade');
+      if (!cascadeColumn) return false;
 
-      const hasAdminCascade = resource.columns?.some(c => c.foreignResource?.onDelete === 'cascade');
-      if (!hasAdminCascade) return false; 
+      const parentResource = config.resources.find(r => r.resourceId === cascadeColumn.foreignResource.resourceId);
+      if (!parentResource) return false;
 
-      const hasDbCascade = Object.values(fkMap).some(v => v);
+      const fkStmt = this.client.prepare(`PRAGMA foreign_key_list(${resource.table})`);
+      const fkRows = await fkStmt.all();
+      const fkMap: { [colName: string]: boolean } = {};
+      fkRows.forEach(fk => { fkMap[fk.from] = fk.on_delete?.toUpperCase() === 'CASCADE'; });
 
-      if (hasDbCascade) {
-        const tableName = (resource.table);
-        afLogger.warn(
-          
-          `Table "${tableName}" has ON DELETE CASCADE, which may conflict with adminForth cascade deletion`
-        );
+      const hasCascadeOnTable = fkMap[cascadeColumn.name] || false;
+      const isUploadPluginInstalled = resource.plugins?.some(p => p.className === "UploadPlugin");
+
+      if (hasCascadeOnTable && isUploadPluginInstalled) {
+          afLogger.warn(`Table "${resource.table}" has ON DELETE CASCADE and UploadPlugin installed, which may conflict with adminForth cascade deletion`);
       }
 
-      return hasDbCascade;
+      return hasCascadeOnTable;
     }
 
     async discoverFields(resource: AdminForthResource, config: AdminForthConfig): Promise<{[key: string]: AdminForthResourceColumn}> {
-        await this.checkCascadeWhenUploadPlugin(resource, config);
 
         const tableName = resource.table;
         const stmt = this.client.prepare(`PRAGMA table_info(${tableName})`);
-        const rows = await stmt.all();
-        const fkStmt = this.client.prepare(`PRAGMA foreign_key_list(${tableName})`);
-        const fkRows = await fkStmt.all();
-        const fkMap: { [colName: string]: boolean } = {};
-        fkRows.forEach(fk => {fkMap[fk.from] = fk.on_delete?.toUpperCase() === 'CASCADE';})
-        await this.hasSQLiteCascadeFk(resource, config, fkMap);
+        const rows = await stmt.all();       
+        await this.hasSQLiteCascadeFk(resource, config);
         const fieldTypes = {};
         rows.forEach((row) => {
           const field: any = {};
@@ -112,7 +111,6 @@ class SQLiteConnector extends AdminForthBaseConnector implements IAdminForthData
           field.required = row.notnull == 1;
           field.primaryKey = row.pk == 1;
 
-          field.cascade = fkMap[row.name] || false;
           field.default = row.dflt_value;
           fieldTypes[row.name] = field
         });