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

Merge pull request #7777 from nocodb/nc-fix/upgrader-bug 

ix: SQLite - upgrader timeout bug
pull/7764/head
Raju Udava 9 months ago committed by GitHub
parent
353f2c33db abd2adb2f9
commit
adbaf17817
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 68 additions and 43 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      packages/nocodb/src/helpers/formulaHelpers.ts
  2. 2
      packages/nocodb/src/models/CalendarViewColumn.ts
  3. 37
      packages/nocodb/src/models/Column.ts
  4. 20
      packages/nocodb/src/models/Filter.ts
  5. 2
      packages/nocodb/src/models/GalleryViewColumn.ts
  6. 4
      packages/nocodb/src/models/GridViewColumn.ts
  7. 8
      packages/nocodb/src/models/Model.ts
  8. 8
      packages/nocodb/src/models/Sort.ts
  9. 10
      packages/nocodb/src/models/View.ts

20
packages/nocodb/src/helpers/formulaHelpers.ts
Unescape View File

@ -2,14 +2,18 @@ import jsep from 'jsep';
import { UITypes } from 'nocodb-sdk'; import { UITypes } from 'nocodb-sdk';
import type FormulaColumn from '../models/FormulaColumn'; import type FormulaColumn from '../models/FormulaColumn';
import type { Column } from '~/models'; import type { Column } from '~/models';
import Noco from '~/Noco';
export async function getFormulasReferredTheColumn({ export async function getFormulasReferredTheColumn(
column, {
columns, column,
}: { columns,
column: Column; }: {
columns: Column[]; column: Column;
}): Promise<Column[]> { columns: Column[];
},
ncMeta = Noco.ncMeta,
): Promise<Column[]> {
const fn = (pt) => { const fn = (pt) => {
if (pt.type === 'CallExpression') { if (pt.type === 'CallExpression') {
return pt.arguments.some((arg) => fn(arg)); return pt.arguments.some((arg) => fn(arg));
@ -25,7 +29,7 @@ export async function getFormulasReferredTheColumn({
const columns = await columnsPromise; const columns = await columnsPromise;
if (c.uidt !== UITypes.Formula) return columns; if (c.uidt !== UITypes.Formula) return columns;
const formula = await c.getColOptions<FormulaColumn>(); const formula = await c.getColOptions<FormulaColumn>(ncMeta);
if (fn(jsep(formula.formula))) { if (fn(jsep(formula.formula))) {
columns.push(c); columns.push(c);

2
packages/nocodb/src/models/CalendarViewColumn.ts
Unescape View File

@ -93,7 +93,7 @@ export default class CalendarViewColumn {
{ {
const view = await View.get(column.fk_view_id, ncMeta); const view = await View.get(column.fk_view_id, ncMeta);
await View.clearSingleQueryCache(view.fk_model_id, [view]); await View.clearSingleQueryCache(view.fk_model_id, [view], ncMeta);
} }
return this.get(id, ncMeta).then(async (viewColumn) => { return this.get(id, ncMeta).then(async (viewColumn) => {

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

@ -216,7 +216,7 @@ export default class Column<T = any> implements ColumnType {
ncMeta, ncMeta,
); );
await View.clearSingleQueryCache(column.fk_model_id); await View.clearSingleQueryCache(column.fk_model_id, null, ncMeta);
return col; return col;
} }
@ -914,7 +914,7 @@ export default class Column<T = any> implements ColumnType {
// on column delete, delete any optimised single query cache // on column delete, delete any optimised single query cache
{ {
await View.clearSingleQueryCache(col.fk_model_id); await View.clearSingleQueryCache(col.fk_model_id, null, ncMeta);
} }
} }
@ -1074,11 +1074,16 @@ export default class Column<T = any> implements ColumnType {
column.column_order.view_id column.column_order.view_id
) { ) {
const viewColumn = ( const viewColumn = (
await View.getColumns(column.column_order.view_id) await View.getColumns(column.column_order.view_id, ncMeta)
).find((col) => col.fk_column_id === column.id); ).find((col) => col.fk_column_id === column.id);
await View.updateColumn(column.column_order.view_id, viewColumn.id, { await View.updateColumn(
order: column.column_order.order, column.column_order.view_id,
}); viewColumn.id,
{
order: column.column_order.order,
},
ncMeta,
);
} }
// set meta // set meta
@ -1098,16 +1103,22 @@ export default class Column<T = any> implements ColumnType {
await this.insertColOption(column, colId, ncMeta); await this.insertColOption(column, colId, ncMeta);
// on column update, delete any optimised single query cache // on column update, delete any optimised single query cache
await View.clearSingleQueryCache(oldCol.fk_model_id); await View.clearSingleQueryCache(oldCol.fk_model_id, null, ncMeta);
const updatedColumn = await Column.get({ colId }); const updatedColumn = await Column.get({ colId }, ncMeta);
if (!skipFormulaInvalidate) { if (!skipFormulaInvalidate) {
// invalidate formula parsed-tree in which current column is used // invalidate formula parsed-tree in which current column is used
// whenever a new request comes for that formula, it will be populated again // whenever a new request comes for that formula, it will be populated again
getFormulasReferredTheColumn({ getFormulasReferredTheColumn(
column: updatedColumn, {
columns: await Column.list({ fk_model_id: oldCol.fk_model_id }, ncMeta), column: updatedColumn,
}) columns: await Column.list(
{ fk_model_id: oldCol.fk_model_id },
ncMeta,
),
},
ncMeta,
)
.then(async (formulas) => { .then(async (formulas) => {
for (const formula of formulas) { for (const formula of formulas) {
await FormulaColumn.update( await FormulaColumn.update(
@ -1146,7 +1157,7 @@ export default class Column<T = any> implements ColumnType {
const column = await Column.get({ colId }, ncMeta); const column = await Column.get({ colId }, ncMeta);
await View.clearSingleQueryCache(column.fk_model_id); await View.clearSingleQueryCache(column.fk_model_id, null, ncMeta);
} }
public getValidators(): any { public getValidators(): any {

20
packages/nocodb/src/models/Filter.ts
Unescape View File

@ -213,7 +213,7 @@ export default class Filter implements FilterType {
if (filter.fk_view_id) { if (filter.fk_view_id) {
const view = await View.get(filter.fk_view_id, ncMeta); const view = await View.get(filter.fk_view_id, ncMeta);
await View.clearSingleQueryCache(view.fk_model_id, [view]); await View.clearSingleQueryCache(view.fk_model_id, [view], ncMeta);
} }
} }
@ -251,9 +251,11 @@ export default class Filter implements FilterType {
// if not a view filter then no need to delete // if not a view filter then no need to delete
if (filter.fk_view_id) { if (filter.fk_view_id) {
const view = await View.get(filter.fk_view_id, ncMeta); const view = await View.get(filter.fk_view_id, ncMeta);
await View.clearSingleQueryCache(view.fk_model_id, [ await View.clearSingleQueryCache(
{ id: filter.fk_view_id }, view.fk_model_id,
]); [{ id: filter.fk_view_id }],
ncMeta,
);
} }
} }
@ -281,9 +283,11 @@ export default class Filter implements FilterType {
if (filter.fk_view_id) { if (filter.fk_view_id) {
const view = await View.get(filter.fk_view_id, ncMeta); const view = await View.get(filter.fk_view_id, ncMeta);
await View.clearSingleQueryCache(view.fk_model_id, [ await View.clearSingleQueryCache(
{ id: filter.fk_view_id }, view.fk_model_id,
]); [{ id: filter.fk_view_id }],
ncMeta,
);
} }
} }
} }
@ -437,7 +441,7 @@ export default class Filter implements FilterType {
// on update delete any optimised single query cache // on update delete any optimised single query cache
{ {
const view = await View.get(viewId, ncMeta); const view = await View.get(viewId, ncMeta);
await View.clearSingleQueryCache(view.fk_model_id, [view]); await View.clearSingleQueryCache(view.fk_model_id, [view], ncMeta);
} }
} }

2
packages/nocodb/src/models/GalleryViewColumn.ts
Unescape View File

@ -81,7 +81,7 @@ export default class GalleryViewColumn {
// on new view column, delete any optimised single query cache // on new view column, delete any optimised single query cache
{ {
const view = await View.get(column.fk_view_id, ncMeta); const view = await View.get(column.fk_view_id, ncMeta);
await View.clearSingleQueryCache(view.fk_model_id, [view]); await View.clearSingleQueryCache(view.fk_model_id, [view], ncMeta);
} }
return this.get(id, ncMeta).then(async (viewColumn) => { return this.get(id, ncMeta).then(async (viewColumn) => {

4
packages/nocodb/src/models/GridViewColumn.ts
Unescape View File

@ -114,7 +114,7 @@ export default class GridViewColumn implements GridColumnType {
// on new view column, delete any optimised single query cache // on new view column, delete any optimised single query cache
{ {
const view = await View.get(column.fk_view_id, ncMeta); const view = await View.get(column.fk_view_id, ncMeta);
await View.clearSingleQueryCache(view.fk_model_id, [view]); await View.clearSingleQueryCache(view.fk_model_id, [view], ncMeta);
} }
return this.get(id, ncMeta).then(async (viewColumn) => { return this.get(id, ncMeta).then(async (viewColumn) => {
@ -159,7 +159,7 @@ export default class GridViewColumn implements GridColumnType {
{ {
const gridCol = await this.get(columnId, ncMeta); const gridCol = await this.get(columnId, ncMeta);
const view = await View.get(gridCol.fk_view_id, ncMeta); const view = await View.get(gridCol.fk_view_id, ncMeta);
await View.clearSingleQueryCache(view.fk_model_id, [view]); await View.clearSingleQueryCache(view.fk_model_id, [view], ncMeta);
} }
return res; return res;

8
packages/nocodb/src/models/Model.ts
Unescape View File

@ -677,7 +677,7 @@ export default class Model implements TableType {
]); ]);
// clear all the cached query under this model // clear all the cached query under this model
await View.clearSingleQueryCache(tableId); await View.clearSingleQueryCache(tableId, null, ncMeta);
// clear all the cached query under related models // clear all the cached query under related models
for (const col of await this.get(tableId).then((t) => t.getColumns())) { for (const col of await this.get(tableId).then((t) => t.getColumns())) {
@ -687,7 +687,11 @@ export default class Model implements TableType {
if (colOptions.fk_related_model_id === tableId) continue; if (colOptions.fk_related_model_id === tableId) continue;
await View.clearSingleQueryCache(colOptions.fk_related_model_id); await View.clearSingleQueryCache(
colOptions.fk_related_model_id,
null,
ncMeta,
);
} }
return res; return res;

8
packages/nocodb/src/models/Sort.ts
Unescape View File

@ -37,7 +37,7 @@ export default class Sort {
// on delete, delete any optimised single query cache // on delete, delete any optimised single query cache
{ {
const view = await View.get(viewId, ncMeta); const view = await View.get(viewId, ncMeta);
await View.clearSingleQueryCache(view.fk_model_id, [view]); await View.clearSingleQueryCache(view.fk_model_id, [view], ncMeta);
} }
} }
@ -95,7 +95,7 @@ export default class Sort {
// on insert, delete any optimised single query cache // on insert, delete any optimised single query cache
{ {
const view = await View.get(row.fk_view_id, ncMeta); const view = await View.get(row.fk_view_id, ncMeta);
await View.clearSingleQueryCache(view.fk_model_id, [view]); await View.clearSingleQueryCache(view.fk_model_id, [view], ncMeta);
} }
return this.get(row.id, ncMeta).then(async (sort) => { return this.get(row.id, ncMeta).then(async (sort) => {
@ -169,7 +169,7 @@ export default class Sort {
{ {
const sort = await this.get(sortId, ncMeta); const sort = await this.get(sortId, ncMeta);
const view = await View.get(sort.fk_view_id, ncMeta); const view = await View.get(sort.fk_view_id, ncMeta);
await View.clearSingleQueryCache(view.fk_model_id, [view]); await View.clearSingleQueryCache(view.fk_model_id, [view], ncMeta);
} }
return res; return res;
@ -188,7 +188,7 @@ export default class Sort {
// on delete, delete any optimised single query cache // on delete, delete any optimised single query cache
if (sort?.fk_view_id) { if (sort?.fk_view_id) {
const view = await View.get(sort.fk_view_id, ncMeta); const view = await View.get(sort.fk_view_id, ncMeta);
await View.clearSingleQueryCache(view.fk_model_id, [view]); await View.clearSingleQueryCache(view.fk_model_id, [view], ncMeta);
} }
} }

10
packages/nocodb/src/models/View.ts
Unescape View File

@ -878,7 +878,7 @@ export default class View implements ViewType {
await NocoCache.update(`${cacheScope}:${colId}`, updateObj); await NocoCache.update(`${cacheScope}:${colId}`, updateObj);
// on view column update, delete corresponding single query cache // on view column update, delete corresponding single query cache
await View.clearSingleQueryCache(view.fk_model_id, [view]); await View.clearSingleQueryCache(view.fk_model_id, [view], ncMeta);
return res; return res;
} }
@ -920,7 +920,7 @@ export default class View implements ViewType {
); );
// on view column update, delete any optimised single query cache // on view column update, delete any optimised single query cache
await View.clearSingleQueryCache(view.fk_model_id, [view]); await View.clearSingleQueryCache(view.fk_model_id, [view], ncMeta);
return { ...existingCol, ...colData }; return { ...existingCol, ...colData };
} else { } else {
@ -1137,7 +1137,7 @@ export default class View implements ViewType {
} }
// on update, delete any optimised single query cache // on update, delete any optimised single query cache
await View.clearSingleQueryCache(view.fk_model_id, [view]); await View.clearSingleQueryCache(view.fk_model_id, [view], ncMeta);
return view; return view;
} }
@ -1188,7 +1188,7 @@ export default class View implements ViewType {
]); ]);
// on update, delete any optimised single query cache // on update, delete any optimised single query cache
await View.clearSingleQueryCache(view.fk_model_id, [view]); await View.clearSingleQueryCache(view.fk_model_id, [view], ncMeta);
await Model.getNonDefaultViewsCountAndReset( await Model.getNonDefaultViewsCountAndReset(
{ modelId: view.fk_model_id }, { modelId: view.fk_model_id },
@ -1476,6 +1476,8 @@ export default class View implements ViewType {
views?: { id?: string }[], views?: { id?: string }[],
ncMeta = Noco.ncMeta, ncMeta = Noco.ncMeta,
) { ) {
if (!Noco.isEE()) return;
// get all views of the model // get all views of the model
let viewsList = let viewsList =
views || (await NocoCache.getList(CacheScope.VIEW, [modelId])).list; views || (await NocoCache.getList(CacheScope.VIEW, [modelId])).list;

Write Preview
Loading…
Cancel
Save