Merge pull request #14679 from Budibase/view-calculation-sql-3
Test all aggregation types.
This commit is contained in:
commit
93c9b229a1
|
@ -2490,6 +2490,61 @@ describe.each([
|
||||||
expect(row["Total Price"]).toEqual(priceByQuantity[row.quantity])
|
expect(row["Total Price"]).toEqual(priceByQuantity[row.quantity])
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
it.each([
|
||||||
|
CalculationType.COUNT,
|
||||||
|
CalculationType.SUM,
|
||||||
|
CalculationType.AVG,
|
||||||
|
CalculationType.MIN,
|
||||||
|
CalculationType.MAX,
|
||||||
|
])("should be able to calculate $type", async type => {
|
||||||
|
const view = await config.api.viewV2.create({
|
||||||
|
tableId: table._id!,
|
||||||
|
name: generator.guid(),
|
||||||
|
schema: {
|
||||||
|
aggregate: {
|
||||||
|
visible: true,
|
||||||
|
calculationType: type,
|
||||||
|
field: "price",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
const response = await config.api.viewV2.search(view.id, {
|
||||||
|
query: {},
|
||||||
|
})
|
||||||
|
|
||||||
|
function calculate(
|
||||||
|
type: CalculationType,
|
||||||
|
numbers: number[]
|
||||||
|
): number {
|
||||||
|
switch (type) {
|
||||||
|
case CalculationType.COUNT:
|
||||||
|
return numbers.length
|
||||||
|
case CalculationType.SUM:
|
||||||
|
return numbers.reduce((a, b) => a + b, 0)
|
||||||
|
case CalculationType.AVG:
|
||||||
|
return numbers.reduce((a, b) => a + b, 0) / numbers.length
|
||||||
|
case CalculationType.MIN:
|
||||||
|
return Math.min(...numbers)
|
||||||
|
case CalculationType.MAX:
|
||||||
|
return Math.max(...numbers)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const prices = rows.map(row => row.price)
|
||||||
|
const expected = calculate(type, prices)
|
||||||
|
const actual = response.rows[0].aggregate
|
||||||
|
|
||||||
|
if (type === CalculationType.AVG) {
|
||||||
|
// The average calculation can introduce floating point rounding
|
||||||
|
// errors, so we need to compare to within a small margin of
|
||||||
|
// error.
|
||||||
|
expect(actual).toBeCloseTo(expected)
|
||||||
|
} else {
|
||||||
|
expect(actual).toEqual(expected)
|
||||||
|
}
|
||||||
|
})
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
|
@ -426,6 +426,25 @@ export async function coreOutputProcessing(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (sdk.views.isView(source)) {
|
||||||
|
const calculationFields = Object.keys(
|
||||||
|
helpers.views.calculationFields(source)
|
||||||
|
)
|
||||||
|
|
||||||
|
// We ensure all calculation fields are returned as numbers. During the
|
||||||
|
// testing of this feature it was discovered that the COUNT operation
|
||||||
|
// returns a string for MySQL, MariaDB, and Postgres. But given that all
|
||||||
|
// calculation fields should be numbers, we blanket make sure of that
|
||||||
|
// here.
|
||||||
|
for (const key of calculationFields) {
|
||||||
|
for (const row of rows) {
|
||||||
|
if (typeof row[key] === "string") {
|
||||||
|
row[key] = parseFloat(row[key])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!isUserMetadataTable(table._id!)) {
|
if (!isUserMetadataTable(table._id!)) {
|
||||||
|
|
Loading…
Reference in New Issue