Browse Source

Merge pull request #7403 from nocodb/nc-fix/cloud-performance-bug

Nc fix: Skip getting column list from database on table/column create
pull/7481/head
Pranav C 11 months ago committed by GitHub
parent
commit
a0419bc708
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 10
      packages/nocodb/src/services/columns.service.ts
  2. 33
      packages/nocodb/src/services/tables.service.ts

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

@ -2009,6 +2009,7 @@ export class ColumnsService {
);
await sqlMgr.sqlOpPlus(source, 'tableUpdate', tableUpdateBody);
if (!source.isMeta()) {
const columns: Array<
Omit<Column, 'column_name' | 'title'> & {
cn: string;
@ -2024,14 +2025,11 @@ export class ColumnsService {
const insertedColumnMeta =
columns.find((c) => c.cn === colBody.column_name) || ({} as any);
Object.assign(colBody, insertedColumnMeta);
}
await Column.insert({
...colBody,
...insertedColumnMeta,
dtxp: [UITypes.MultiSelect, UITypes.SingleSelect].includes(
colBody.uidt as any,
)
? colBody.dtxp
: insertedColumnMeta.dtxp,
fk_model_id: table.id,
});
}

33
packages/nocodb/src/services/tables.service.ts

@ -381,7 +381,7 @@ export class TablesService {
validatePayload('swagger.json#/components/schemas/TableReq', param.table);
const tableCreatePayLoad: Omit<TableReqType, 'columns'> & {
columns: (Omit<ColumnType, 'column_name' | 'title'> & { cn?: string })[];
columns: (ColumnType & { cn?: string })[];
} = {
...param.table,
};
@ -548,6 +548,8 @@ export class TablesService {
const uniqueColumnNameCount = {};
mapDefaultDisplayValue(param.table.columns);
for (const column of param.table.columns) {
if (
!isVirtualCol(column) ||
@ -604,43 +606,36 @@ export class TablesService {
tn: tableCreatePayLoad.table_name,
});
const columns: Array<
let columns: Array<
Omit<Column, 'column_name' | 'title'> & {
cn: string;
system?: boolean;
}
> = (
>;
if (!source.isMeta()) {
columns = (
await sqlMgr.sqlOpPlus(source, 'columnList', {
tn: tableCreatePayLoad.table_name,
schema: source.getConfig()?.schema,
})
)?.data?.list;
}
const tables = await Model.list({
base_id: base.id,
source_id: source.id,
});
mapDefaultDisplayValue(param.table.columns);
// todo: type correction
const result = await Model.insert(base.id, source.id, {
...tableCreatePayLoad,
columns: columns.map((c, i) => {
const colMetaFromReq = param.table?.columns?.find(
(c1) => c.cn === c1.column_name,
);
columns: tableCreatePayLoad.columns.map((c, i) => {
const colMetaFromDb = columns?.find((c1) => c.cn === c1.cn);
return {
...colMetaFromReq,
uidt: colMetaFromReq?.uidt || c.uidt || getColumnUiType(source, c),
...c,
dtxp: [UITypes.MultiSelect, UITypes.SingleSelect].includes(
colMetaFromReq.uidt as any,
)
? colMetaFromReq.dtxp
: c.dtxp,
title: colMetaFromReq?.title || getColumnNameAlias(c.cn, source),
column_name: c.cn,
uidt: c.uidt || getColumnUiType(source, colMetaFromDb || c),
...(colMetaFromDb || {}),
title: c.title || getColumnNameAlias(c.cn, source),
column_name: colMetaFromDb?.cn || c.cn || c.column_name,
order: i + 1,
} as NormalColumnRequestType;
}),

Loading…
Cancel
Save