MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Resync if it is found that a table or column is missing, this was previously done for specific cases but have expanded to cover all, but only retry once (not get into an infinite loop).

This commit is contained in:
mike12345567 2024-07-11 16:35:57 +01:00
parent 00b4af0a4d
commit 6db0379504
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/server/src/sdk/app/rows/search/sqs.ts
View File

@ -240,10 +240,10 @@ async function runSqlQuery(
function resyncDefinitionsRequired(status: number, message: string) { function resyncDefinitionsRequired(status: number, message: string) {
// pre data_ prefix on column names, need to resync // pre data_ prefix on column names, need to resync
return ( return (
(status === 400 && message?.match(USER_COLUMN_PREFIX_REGEX)) || // there are tables missing - try a resync
// default tables aren't included in definition (status === 400 && message.includes("no such table: ")) ||
(status === 400 && // there are columns missing - try a resync
DEFAULT_TABLE_IDS.find(tableId => message?.includes(tableId))) || (status === 400 && message.includes("no such column: ")) ||
// no design document found, needs a full sync // no design document found, needs a full sync
(status === 404 && message?.includes(SQLITE_DESIGN_DOC_ID)) (status === 404 && message?.includes(SQLITE_DESIGN_DOC_ID))
) )
@ -251,7 +251,8 @@ function resyncDefinitionsRequired(status: number, message: string) {
export async function search( export async function search(
options: RowSearchParams, options: RowSearchParams,
table: Table table: Table,
opts?: { retry?: boolean }
): Promise<SearchResponse<Row>> { ): Promise<SearchResponse<Row>> {
let { paginate, query, ...params } = options let { paginate, query, ...params } = options
@ -376,9 +377,9 @@ export async function search(
return response return response
} catch (err: any) { } catch (err: any) {
const msg = typeof err === "string" ? err : err.message const msg = typeof err === "string" ? err : err.message
if (resyncDefinitionsRequired(err.status, msg)) { if (!opts?.retry && resyncDefinitionsRequired(err.status, msg)) {
await sdk.tables.sqs.syncDefinition() await sdk.tables.sqs.syncDefinition()
return search(options, table) return search(options, table, { retry: true })
} }
// previously the internal table didn't error when a column didn't exist in search // previously the internal table didn't error when a column didn't exist in search
if (err.status === 400 && msg?.match(MISSING_COLUMN_REGEX)) { if (err.status === 400 && msg?.match(MISSING_COLUMN_REGEX)) {