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

Fixes for deleting records when a table is deleted.

This commit is contained in:
mike12345567 2020-10-12 16:37:08 +01:00
parent dbee2b4efc
commit 9bf568ecb1
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/server/src/api/controllers/model.js
View File

@ -105,11 +105,8 @@ exports.save = async function(ctx) {
exports.destroy = async function(ctx) { exports.destroy = async function(ctx) {
const instanceId = ctx.user.instanceId const instanceId = ctx.user.instanceId
const db = new CouchDB(instanceId) const db = new CouchDB(instanceId)
const modelToDelete = await db.get(ctx.params.modelId) const modelToDelete = await db.get(ctx.params.modelId)
await db.remove(modelToDelete)
// Delete all records for that model // Delete all records for that model
const records = await db.allDocs( const records = await db.allDocs(
getRecordParams(ctx.params.modelId, null, { getRecordParams(ctx.params.modelId, null, {
@ -117,7 +114,7 @@ exports.destroy = async function(ctx) {
}) })
) )
await db.bulkDocs( await db.bulkDocs(
records.rows.map(record => ({ _id: record.id, _deleted: true })) records.rows.map(record => ({ ...record.doc, _deleted: true }))
) )
// update linked records // update linked records
@ -127,6 +124,9 @@ exports.destroy = async function(ctx) {
model: modelToDelete, model: modelToDelete,
}) })
// don't remove the table itself until very end
await db.remove(modelToDelete)
ctx.eventEmitter && ctx.eventEmitter &&
ctx.eventEmitter.emitModel(`model:delete`, instanceId, modelToDelete) ctx.eventEmitter.emitModel(`model:delete`, instanceId, modelToDelete)
ctx.status = 200 ctx.status = 200

13
packages/server/src/db/utils.js
View File

@ -57,21 +57,26 @@ exports.generateModelID = () => {
/** /**
* Gets the DB allDocs/query params for retrieving a record. * Gets the DB allDocs/query params for retrieving a record.
* @param {string} modelId The model in which the records have been stored. * @param {string|null} modelId The model in which the records have been stored.
* @param {string|null} recordId The ID of the record which is being specifically queried for. This can be * @param {string|null} recordId The ID of the record which is being specifically queried for. This can be
* left null to get all the records in the model. * left null to get all the records in the model.
* @param {object} otherProps Any other properties to add to the request. * @param {object} otherProps Any other properties to add to the request.
* @returns {object} Parameters which can then be used with an allDocs request. * @returns {object} Parameters which can then be used with an allDocs request.
*/ */
exports.getRecordParams = (modelId, recordId = null, otherProps = {}) => { exports.getRecordParams = (
modelId = null,
recordId = null,
otherProps = {}
) => {
if (modelId == null) { if (modelId == null) {
throw "Cannot build params for records without a model ID" return getDocParams(DocumentTypes.RECORD, null, otherProps)
} } else {
const endOfKey = const endOfKey =
recordId == null recordId == null
? `${modelId}${SEPARATOR}` ? `${modelId}${SEPARATOR}`
: `${modelId}${SEPARATOR}${recordId}` : `${modelId}${SEPARATOR}${recordId}`
return getDocParams(DocumentTypes.RECORD, endOfKey, otherProps) return getDocParams(DocumentTypes.RECORD, endOfKey, otherProps)
}
} }
/** /**