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

Refactor - simplify regex and use enum

This commit is contained in:
Mel O'Hagan 2022-06-23 09:41:43 +01:00
parent 9603a92c2c
commit ece1e7533d
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/server/src/integrations/base/sql.ts
View File

@ -93,13 +93,14 @@ function generateSelectStatement(json: QueryJson, knex: Knex): any[] {
const { resource, meta } = json const { resource, meta } = json
const schema = meta?.table?.schema const schema = meta?.table?.schema
return resource.fields.map(field => { return resource.fields.map(field => {
const shortFieldName = field.match(/(?<=\.).*$/g)?.[0] const fieldNames = field.split(/\./g)
if (shortFieldName && knex.client.config.client === "pg") { const tableName = fieldNames[0]
const externalType = schema?.[shortFieldName].externalType const columnName = fieldNames[1]
if (columnName && knex.client.config.client === SqlClients.POSTGRES) {
const externalType = schema?.[columnName].externalType
if (externalType?.includes("money")) { if (externalType?.includes("money")) {
const fieldName = field.split(/\./g)
return knex.raw( return knex.raw(
`"${fieldName?.[0]}"."${fieldName?.[1]}"::money::numeric as "${field}"` `"${tableName}"."${columnName}"::money::numeric as "${field}"`
) )
} }
} }