Browse Source

fix: one-to-one column delete bug

pull/8399/head
Pranav C 7 months ago
parent
commit
ba47522286
  1. 13
      packages/nocodb/src/services/columns.service.ts

13
packages/nocodb/src/services/columns.service.ts

@ -5,6 +5,7 @@ import {
isCreatedOrLastModifiedTimeCol, isCreatedOrLastModifiedTimeCol,
isLinksOrLTAR, isLinksOrLTAR,
isVirtualCol, isVirtualCol,
RelationTypes,
substituteColumnAliasWithIdInFormula, substituteColumnAliasWithIdInFormula,
substituteColumnIdWithAliasInFormula, substituteColumnIdWithAliasInFormula,
UITypes, UITypes,
@ -18,7 +19,6 @@ import type {
ColumnReqType, ColumnReqType,
LinkToAnotherColumnReqType, LinkToAnotherColumnReqType,
LinkToAnotherRecordType, LinkToAnotherRecordType,
RelationTypes,
UserType, UserType,
} from 'nocodb-sdk'; } from 'nocodb-sdk';
import type CustomKnex from '~/db/CustomKnex'; import type CustomKnex from '~/db/CustomKnex';
@ -2417,9 +2417,9 @@ export class ColumnsService {
}; };
await sqlMgr.sqlOpPlus(source, 'tableUpdate', tableUpdateBody); await sqlMgr.sqlOpPlus(source, 'tableUpdate', tableUpdateBody);
// delete foreign key column
await Column.delete(childColumn.id, ncMeta);
} }
// delete foreign key column
await Column.delete(childColumn.id, ncMeta);
}; };
deleteOoRelation = async ( deleteOoRelation = async (
@ -2492,7 +2492,7 @@ export class ColumnsService {
const columnsInRelatedTable: Column[] = await relationColOpt const columnsInRelatedTable: Column[] = await relationColOpt
.getRelatedTable(ncMeta) .getRelatedTable(ncMeta)
.then((m) => m.getColumns(ncMeta)); .then((m) => m.getColumns(ncMeta));
const relType = relationColOpt.type === 'bt' ? 'hm' : 'bt'; const relType = RelationTypes.ONE_TO_ONE;
for (const c of columnsInRelatedTable) { for (const c of columnsInRelatedTable) {
if (c.uidt !== UITypes.LinkToAnotherRecord) continue; if (c.uidt !== UITypes.LinkToAnotherRecord) continue;
const colOpt = await c.getColOptions<LinkToAnotherRecordColumn>(ncMeta); const colOpt = await c.getColOptions<LinkToAnotherRecordColumn>(ncMeta);
@ -2562,9 +2562,10 @@ export class ColumnsService {
}; };
await sqlMgr.sqlOpPlus(source, 'tableUpdate', tableUpdateBody); await sqlMgr.sqlOpPlus(source, 'tableUpdate', tableUpdateBody);
// delete foreign key column
await Column.delete(childColumn.id, ncMeta);
} }
// delete foreign key column
await Column.delete(childColumn.id, ncMeta);
}; };
async createLTARColumn(param: { async createLTARColumn(param: {

Loading…
Cancel
Save