github
/
nocodb
mirror of https://github.com/nocodb/nocodb
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

feat: table delete with relation (WIP) 

Signed-off-by: Pranav C <pranavxc@gmail.com>
test/reset-fail
Pranav C 1 year ago
parent
671d87db5e
commit
6cba56bde1
3 changed files with 143 additions and 92 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      packages/nocodb/src/models/Column.ts
  2. 130
      packages/nocodb/src/services/columns.service.ts
  3. 94
      packages/nocodb/src/services/tables.service.ts

11
packages/nocodb/src/models/Column.ts
Unescape View File

@ -65,10 +65,13 @@ export default class Column<T = any> implements ColumnType {
Object.assign(this, data);
}
public async getModel(): Promise<Model> {
return Model.getByIdOrName({
id: this.fk_model_id,
});
public async getModel(ncMeta = Noco.ncMeta): Promise<Model> {
return Model.getByIdOrName(
{
id: this.fk_model_id,
},
ncMeta,
);
}
public static async insert<T>(

130
packages/nocodb/src/services/columns.service.ts
Unescape View File

@ -38,8 +38,8 @@ import {
import Noco from '../Noco';
import NcConnectionMgrv2 from '../utils/common/NcConnectionMgrv2';
import { MetaTable } from '../utils/globals';
import { MetaService } from '../meta/meta.service';
import type { LinkToAnotherRecordColumn, Project } from '../models';
import type { MetaService } from '../meta/meta.service';
import type SqlMgrv2 from '../db/sql-mgr/v2/SqlMgrv2';
import type {
ColumnReqType,
@ -57,6 +57,8 @@ export enum Altered {
@Injectable()
export class ColumnsService {
constructor(private readonly metaService: MetaService) {}
async columnUpdate(param: {
req?: any;
columnId: string;
@ -1142,19 +1144,18 @@ export class ColumnsService {
return table;
}
async columnDelete(param: { req?: any; columnId: string }) {
const column = await Column.get({ colId: param.columnId });
const table = await Model.getWithInfo({
id: column.fk_model_id,
});
const base = await Base.get(table.base_id);
// const ncMeta = await Noco.ncMeta.startTransaction();
// const sql-mgr = await ProjectMgrv2.getSqlMgrTrans(
// { id: base.project_id },
// ncMeta,
// base
// );
async columnDelete(
param: { req?: any; columnId: string },
ncMeta = this.metaService,
) {
const column = await Column.get({ colId: param.columnId }, ncMeta);
const table = await Model.getWithInfo(
{
id: column.fk_model_id,
},
ncMeta,
);
const base = await Base.get(table.base_id, ncMeta);
const sqlMgr = await ProjectMgrv2.getSqlMgr({ id: base.project_id });
@ -1164,17 +1165,17 @@ export class ColumnsService {
case UITypes.QrCode:
case UITypes.Barcode:
case UITypes.Formula:
await Column.delete(param.columnId);
await Column.delete(param.columnId, ncMeta);
break;
case UITypes.LinkToAnotherRecord:
{
const relationColOpt =
await column.getColOptions<LinkToAnotherRecordColumn>();
const childColumn = await relationColOpt.getChildColumn();
const childTable = await childColumn.getModel();
await column.getColOptions<LinkToAnotherRecordColumn>(ncMeta);
const childColumn = await relationColOpt.getChildColumn(ncMeta);
const childTable = await childColumn.getModel(ncMeta);
const parentColumn = await relationColOpt.getParentColumn();
const parentTable = await parentColumn.getModel();
const parentColumn = await relationColOpt.getParentColumn(ncMeta);
const parentTable = await parentColumn.getModel(ncMeta);
switch (relationColOpt.type) {
case 'bt':
@ -1188,15 +1189,19 @@ export class ColumnsService {
parentColumn,
parentTable,
sqlMgr,
// ncMeta
ncMeta,
});
}
break;
case 'mm':
{
const mmTable = await relationColOpt.getMMModel();
const mmParentCol = await relationColOpt.getMMParentColumn();
const mmChildCol = await relationColOpt.getMMChildColumn();
const mmTable = await relationColOpt.getMMModel(ncMeta);
const mmParentCol = await relationColOpt.getMMParentColumn(
ncMeta,
);
const mmChildCol = await relationColOpt.getMMChildColumn(
ncMeta,
);
await this.deleteHmOrBtRelation(
{
@ -1207,7 +1212,7 @@ export class ColumnsService {
parentTable: parentTable,
childColumn: mmParentCol,
base,
// ncMeta
ncMeta,
},
true,
);
@ -1221,18 +1226,18 @@ export class ColumnsService {
parentTable: childTable,
childColumn: mmChildCol,
base,
// ncMeta
ncMeta,
},
true,
);
const columnsInRelatedTable: Column[] = await relationColOpt
.getRelatedTable()
.then((m) => m.getColumns());
.getRelatedTable(ncMeta)
.then((m) => m.getColumns(ncMeta));
for (const c of columnsInRelatedTable) {
if (c.uidt !== UITypes.LinkToAnotherRecord) continue;
const colOpt =
await c.getColOptions<LinkToAnotherRecordColumn>();
await c.getColOptions<LinkToAnotherRecordColumn>(ncMeta);
if (
colOpt.type === 'mm' &&
colOpt.fk_parent_column_id === childColumn.id &&
@ -1241,55 +1246,55 @@ export class ColumnsService {
colOpt.fk_mm_parent_column_id === mmChildCol.id &&
colOpt.fk_mm_child_column_id === mmParentCol.id
) {
await Column.delete(c.id);
await Column.delete(c.id, ncMeta);
break;
}
}
await Column.delete(relationColOpt.fk_column_id);
await Column.delete(relationColOpt.fk_column_id, ncMeta);
// delete bt columns in m2m table
await mmTable.getColumns();
await mmTable.getColumns(ncMeta);
for (const c of mmTable.columns) {
if (c.uidt !== UITypes.LinkToAnotherRecord) continue;
const colOpt =
await c.getColOptions<LinkToAnotherRecordColumn>();
await c.getColOptions<LinkToAnotherRecordColumn>(ncMeta);
if (colOpt.type === 'bt') {
await Column.delete(c.id);
await Column.delete(c.id, ncMeta);
}
}
// delete hm columns in parent table
await parentTable.getColumns();
await parentTable.getColumns(ncMeta);
for (const c of parentTable.columns) {
if (c.uidt !== UITypes.LinkToAnotherRecord) continue;
const colOpt =
await c.getColOptions<LinkToAnotherRecordColumn>();
await c.getColOptions<LinkToAnotherRecordColumn>(ncMeta);
if (colOpt.fk_related_model_id === mmTable.id) {
await Column.delete(c.id);
}
}
// delete hm columns in child table
await childTable.getColumns();
await childTable.getColumns(ncMeta);
for (const c of childTable.columns) {
if (c.uidt !== UITypes.LinkToAnotherRecord) continue;
const colOpt =
await c.getColOptions<LinkToAnotherRecordColumn>();
await c.getColOptions<LinkToAnotherRecordColumn>(ncMeta);
if (colOpt.fk_related_model_id === mmTable.id) {
await Column.delete(c.id);
await Column.delete(c.id, ncMeta);
}
}
// retrieve columns in m2m table again
await mmTable.getColumns();
await mmTable.getColumns(ncMeta);
// ignore deleting table if it has more than 2 columns
// the expected 2 columns would be table1_id & table2_id
if (mmTable.columns.length === 2) {
(mmTable as any).tn = mmTable.table_name;
await sqlMgr.sqlOpPlus(base, 'tableDelete', mmTable);
await mmTable.delete();
await mmTable.delete(ncMeta);
}
}
break;
@ -1337,26 +1342,30 @@ export class ColumnsService {
await sqlMgr.sqlOpPlus(base, 'tableUpdate', tableUpdateBody);
await Column.delete(param.columnId);
await Column.delete(param.columnId, ncMeta);
}
}
await Audit.insert({
project_id: base.project_id,
op_type: AuditOperationTypes.TABLE_COLUMN,
op_sub_type: AuditOperationSubTypes.DELETE,
user: param?.req?.user?.email,
description: `The column ${column.column_name} with alias ${column.title} from table ${table.table_name} has been deleted`,
ip: param?.req.clientIp,
});
await table.getColumns();
await Audit.insert(
{
project_id: base.project_id,
op_type: AuditOperationTypes.TABLE_COLUMN,
op_sub_type: AuditOperationSubTypes.DELETE,
user: param?.req?.user?.email,
description: `The column ${column.column_name} with alias ${column.title} from table ${table.table_name} has been deleted`,
ip: param?.req.clientIp,
},
ncMeta,
);
await table.getColumns(ncMeta);
const displayValueColumn = mapDefaultDisplayValue(table.columns);
if (displayValueColumn) {
await Model.updatePrimaryColumn(
displayValueColumn.fk_model_id,
displayValueColumn.id,
ncMeta,
);
}
@ -1394,7 +1403,7 @@ export class ColumnsService {
if (!relationColOpt) {
foreignKeyName = (
(
await childTable.getColumns().then((cols) => {
await childTable.getColumns(ncMeta).then((cols) => {
return cols?.find((c) => {
return (
c.uidt === UITypes.LinkToAnotherRecord &&
@ -1427,12 +1436,12 @@ export class ColumnsService {
if (!relationColOpt) return;
const columnsInRelatedTable: Column[] = await relationColOpt
.getRelatedTable()
.then((m) => m.getColumns());
.getRelatedTable(ncMeta)
.then((m) => m.getColumns(ncMeta));
const relType = relationColOpt.type === 'bt' ? 'hm' : 'bt';
for (const c of columnsInRelatedTable) {
if (c.uidt !== UITypes.LinkToAnotherRecord) continue;
const colOpt = await c.getColOptions<LinkToAnotherRecordColumn>();
const colOpt = await c.getColOptions<LinkToAnotherRecordColumn>(ncMeta);
if (
colOpt.fk_parent_column_id === parentColumn.id &&
colOpt.fk_child_column_id === childColumn.id &&
@ -1447,9 +1456,12 @@ export class ColumnsService {
await Column.delete(relationColOpt.fk_column_id, ncMeta);
if (!ignoreFkDelete) {
const cTable = await Model.getWithInfo({
id: childTable.id,
});
const cTable = await Model.getWithInfo(
{
id: childTable.id,
},
ncMeta,
);
const tableUpdateBody = {
...cTable,
tn: cTable.table_name,

94
packages/nocodb/src/services/tables.service.ts
Unescape View File

@ -14,9 +14,19 @@ import getColumnPropsFromUIDT from '../helpers/getColumnPropsFromUIDT';
import getColumnUiType from '../helpers/getColumnUiType';
import getTableNameAlias, { getColumnNameAlias } from '../helpers/getTableName';
import mapDefaultDisplayValue from '../helpers/mapDefaultDisplayValue';
import { Audit, Column, Model, ModelRoleVisibility, Project } from '../models';
import {
Audit,
Base,
Column,
Model,
ModelRoleVisibility,
Project,
} from '../models';
import Noco from '../Noco';
import NcConnectionMgrv2 from '../utils/common/NcConnectionMgrv2';
import { validatePayload } from '../helpers';
import { ColumnsService } from './columns.service';
import type { MetaService } from '../meta/meta.service';
import type { LinkToAnotherRecordColumn, User, View } from '../models';
import type {
ColumnType,
@ -26,6 +36,8 @@ import type {
@Injectable()
export class TablesService {
constructor(private readonly columnsService: ColumnsService) {}
async tableUpdate(param: {
tableId: any;
table: TableReqType & { project_id?: string };
@ -142,11 +154,14 @@ export class TablesService {
const table = await Model.getByIdOrName({ id: param.tableId });
await table.getColumns();
const project = await Project.getWithInfo(table.project_id);
const base = project.bases.find((b) => b.id === table.base_id);
const relationColumns = table.columns.filter(
(c) => c.uidt === UITypes.LinkToAnotherRecord,
);
if (relationColumns?.length) {
if (relationColumns?.length && !base.is_meta) {
const referredTables = await Promise.all(
relationColumns.map(async (c) =>
c
@ -162,37 +177,58 @@ export class TablesService {
);
}
const project = await Project.getWithInfo(table.project_id);
const base = project.bases.find((b) => b.id === table.base_id);
const sqlMgr = await ProjectMgrv2.getSqlMgr(project);
(table as any).tn = table.table_name;
table.columns = table.columns.filter((c) => !isVirtualCol(c));
table.columns.forEach((c) => {
(c as any).cn = c.column_name;
});
// start a transaction
const ncMeta = await (Noco.ncMeta as MetaService).startTransaction();
let result;
try {
// delete all relations
await Promise.all(
relationColumns.map((c) => {
return this.columnsService.columnDelete(
{
req: param.req,
columnId: c.id,
},
ncMeta,
);
}),
);
if (table.type === ModelTypes.TABLE) {
await sqlMgr.sqlOpPlus(base, 'tableDelete', table);
} else if (table.type === ModelTypes.VIEW) {
await sqlMgr.sqlOpPlus(base, 'viewDelete', {
...table,
view_name: table.table_name,
const sqlMgr = await ProjectMgrv2.getSqlMgr(project);
(table as any).tn = table.table_name;
table.columns = table.columns.filter((c) => !isVirtualCol(c));
table.columns.forEach((c) => {
(c as any).cn = c.column_name;
});
}
await Audit.insert({
project_id: project.id,
base_id: base.id,
op_type: AuditOperationTypes.TABLE,
op_sub_type: AuditOperationSubTypes.DELETE,
user: param.user?.email,
description: `Deleted ${table.type} ${table.table_name} with alias ${table.title} `,
ip: param.req?.clientIp,
}).then(() => {});
T.emit('evt', { evt_type: 'table:deleted' });
if (table.type === ModelTypes.TABLE) {
await sqlMgr.sqlOpPlus(base, 'tableDelete', table);
} else if (table.type === ModelTypes.VIEW) {
await sqlMgr.sqlOpPlus(base, 'viewDelete', {
...table,
view_name: table.table_name,
});
}
return table.delete();
await Audit.insert({
project_id: project.id,
base_id: base.id,
op_type: AuditOperationTypes.TABLE,
op_sub_type: AuditOperationSubTypes.DELETE,
user: param.user?.email,
description: `Deleted ${table.type} ${table.table_name} with alias ${table.title} `,
ip: param.req?.clientIp,
}).then(() => {});
T.emit('evt', { evt_type: 'table:deleted' });
result = await table.delete(ncMeta);
await ncMeta.commit();
} catch (e) {
await ncMeta.rollback();
throw e;
}
return result;
}
async getTableWithAccessibleViews(param: { tableId: string; user: User }) {

Write Preview
Loading…
Cancel
Save