Browse Source

Merge pull request #1858 from nocodb/fix/1847-sqlite-migration

Fix/1847 sqlite migration
pull/1877/head
navi 3 years ago committed by GitHub
parent
commit
c906c03c3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 32
      packages/nocodb/src/lib/noco/upgrader/jobs/ncProjectUpgraderV2_0090000.ts

32
packages/nocodb/src/lib/noco/upgrader/jobs/ncProjectUpgraderV2_0090000.ts

@ -1070,17 +1070,30 @@ async function migrateUIAcl(ctx: MigrateCtxV1, ncMeta: any) {
}> = await ncMeta.metaList(null, null, 'nc_disabled_models_for_role'); }> = await ncMeta.metaList(null, null, 'nc_disabled_models_for_role');
for (const acl of uiAclList) { for (const acl of uiAclList) {
// if missing model name skip the view acl migration
if (!acl.title) continue;
let fk_view_id; let fk_view_id;
if (acl.type === 'vtable') { if (acl.type === 'vtable') {
// if missing parent model name skip the view acl migration
if (!acl.parent_model_title) continue;
fk_view_id = fk_view_id =
ctx.objViewRef[acl.project_id][acl.parent_model_title][acl.title].id; ctx.objViewRef[acl.project_id]?.[
(
ctx.objModelRef?.[acl.project_id]?.[acl.parent_model_title] ||
ctx.objModelAliasRef?.[acl.project_id]?.[acl.parent_model_title]
)?.table_name
]?.[acl.title]?.id;
} else { } else {
fk_view_id = fk_view_id =
ctx.objViewRef[acl.project_id][acl.title][ ctx.objViewRef?.[acl.project_id]?.[acl.title]?.[
ctx.objModelRef[acl.project_id][acl.title].title ctx.objModelRef?.[acl.project_id]?.[acl.title]?.title
].id || ctx.objViewRef[acl.project_id][acl.title][acl.title].id; ].id || ctx.objViewRef[acl.project_id]?.[acl.title]?.[acl.title]?.id;
} }
// if view id missing skip ui acl view migration
if (!fk_view_id) continue;
await ModelRoleVisibility.insert( await ModelRoleVisibility.insert(
{ {
role: acl.role, role: acl.role,
@ -1112,9 +1125,14 @@ async function migrateSharedViews(ctx: MigrateCtxV1, ncMeta: any) {
if (sharedView.view_type !== 'table' && sharedView.view_type !== 'view') { if (sharedView.view_type !== 'table' && sharedView.view_type !== 'view') {
fk_view_id = fk_view_id =
ctx.objViewRef[sharedView.project_id]?.[sharedView.model_name]?.[ ctx.objViewRef[sharedView.project_id]?.[
sharedView.view_name (
]?.id; ctx.objModelRef?.[sharedView.project_id]?.[sharedView.model_name] ||
ctx.objModelAliasRef?.[sharedView.project_id]?.[
sharedView.model_name
]
)?.title
]?.[sharedView.view_name]?.id;
} else { } else {
fk_view_id = fk_view_id =
ctx.objViewRef[sharedView.project_id]?.[sharedView.model_name]?.[ ctx.objViewRef[sharedView.project_id]?.[sharedView.model_name]?.[

Loading…
Cancel
Save