Fix quote count
This commit is contained in:
parent
24cdfb3443
commit
f794f84e90
|
@ -183,6 +183,8 @@ export async function handleDataImport(
|
||||||
|
|
||||||
const finalData = await importToRows(data, table, user)
|
const finalData = await importToRows(data, table, user)
|
||||||
|
|
||||||
|
let newRowCount = finalData.length
|
||||||
|
|
||||||
//Set IDs of finalData to match existing row if an update is expected
|
//Set IDs of finalData to match existing row if an update is expected
|
||||||
if (identifierFields.length > 0) {
|
if (identifierFields.length > 0) {
|
||||||
const allDocs = await db.allDocs(
|
const allDocs = await db.allDocs(
|
||||||
|
@ -204,12 +206,14 @@ export async function handleDataImport(
|
||||||
if (match) {
|
if (match) {
|
||||||
finalItem._id = doc._id
|
finalItem._id = doc._id
|
||||||
finalItem._rev = doc._rev
|
finalItem._rev = doc._rev
|
||||||
|
|
||||||
|
newRowCount--
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
await quotas.addRows(finalData.length, () => db.bulkDocs(finalData), {
|
await quotas.addRows(newRowCount, () => db.bulkDocs(finalData), {
|
||||||
tableId: table._id,
|
tableId: table._id,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
|
@ -1320,6 +1320,7 @@ describe.each([
|
||||||
description: "Existing description",
|
description: "Existing description",
|
||||||
})
|
})
|
||||||
|
|
||||||
|
const rowUsage = await getRowUsage()
|
||||||
|
|
||||||
await config.api.row.bulkImport(table._id!, {
|
await config.api.row.bulkImport(table._id!, {
|
||||||
rows: [
|
rows: [
|
||||||
|
@ -1346,6 +1347,8 @@ describe.each([
|
||||||
expect(rows[1].description).toEqual("Row 2 description")
|
expect(rows[1].description).toEqual("Row 2 description")
|
||||||
expect(rows[2].name).toEqual("Updated existing row")
|
expect(rows[2].name).toEqual("Updated existing row")
|
||||||
expect(rows[2].description).toEqual("Existing description")
|
expect(rows[2].description).toEqual("Existing description")
|
||||||
|
|
||||||
|
await assertRowUsage(rowUsage + 2)
|
||||||
})
|
})
|
||||||
|
|
||||||
// Upserting isn't yet supported in MSSQL, see:
|
// Upserting isn't yet supported in MSSQL, see:
|
||||||
|
|
Loading…
Reference in New Issue