Browse Source

refactor: if missing mm table handle it by static error message

pull/7524/head
Pranav C 9 months ago
parent
commit
04e6529ce3
  1. 4
      packages/nocodb-sdk/src/lib/globals.ts
  2. 2
      packages/nocodb-sdk/src/lib/index.ts
  3. 8
      packages/nocodb/src/db/genRollupSelectv2.ts

4
packages/nocodb-sdk/src/lib/globals.ts

@ -123,6 +123,10 @@ export enum TiptapMarksTypes {
underline = 'underline',
}
export enum NcDataErrorCodes {
NC_ERR_MM_MODEL_NOT_FOUND = 'NC_ERR_MM_MODEL_NOT_FOUND',
}
type Roles = OrgUserRoles | ProjectRoles | WorkspaceUserRoles;
type RolesObj = Partial<Record<Roles, boolean>>;

2
packages/nocodb-sdk/src/lib/index.ts

@ -16,7 +16,7 @@ export {
isLinksOrLTAR,
isCreatedOrLastModifiedTimeCol,
isCreatedOrLastModifiedByCol,
isMMSystemCol
isMMSystemCol,
} from '~/lib/UITypes';
export { default as CustomAPI, FileType } from '~/lib/CustomAPI';
export { default as TemplateGenerator } from '~/lib/TemplateGenerator';

8
packages/nocodb/src/db/genRollupSelectv2.ts

@ -1,4 +1,4 @@
import { RelationTypes } from 'nocodb-sdk';
import { NcDataErrorCodes, RelationTypes } from 'nocodb-sdk';
import type { BaseModelSqlv2 } from '~/db/BaseModelSqlv2';
import type { LinksColumn } from '~/models';
import type { RollupColumn } from '~/models';
@ -56,6 +56,12 @@ export default async function ({
const mmChildCol = await relationColumnOption.getMMChildColumn();
const mmParentCol = await relationColumnOption.getMMParentColumn();
if (!mmModel) {
return this.dbDriver.raw(`?`, [
NcDataErrorCodes.NC_ERR_MM_MODEL_NOT_FOUND,
]);
}
return {
builder: knex(
knex.raw(`?? as ??`, [

Loading…
Cancel
Save