|
|
@ -3,12 +3,12 @@ import { jsepCurlyHook, UITypes } from 'nocodb-sdk'; |
|
|
|
import mapFunctionName from '../mapFunctionName'; |
|
|
|
import mapFunctionName from '../mapFunctionName'; |
|
|
|
import genRollupSelectv2 from '../genRollupSelectv2'; |
|
|
|
import genRollupSelectv2 from '../genRollupSelectv2'; |
|
|
|
import FormulaColumn from '../../models/FormulaColumn'; |
|
|
|
import FormulaColumn from '../../models/FormulaColumn'; |
|
|
|
import { validateDateWithUnknownFormat } from '../../helpers/formulaFnHelper'; |
|
|
|
import { convertDateFormatForConcat, validateDateWithUnknownFormat } from '../../helpers/formulaFnHelper'; |
|
|
|
import { CacheGetType, CacheScope } from '../../utils/globals'; |
|
|
|
import { CacheGetType, CacheScope } from '../../utils/globals'; |
|
|
|
import NocoCache from '../../cache/NocoCache'; |
|
|
|
import NocoCache from '../../cache/NocoCache'; |
|
|
|
import type { XKnex } from '../CustomKnex'; |
|
|
|
import type { XKnex } from '../CustomKnex'; |
|
|
|
import type Model from '../../models/Model'; |
|
|
|
|
|
|
|
import type Column from '../../models/Column'; |
|
|
|
import type Column from '../../models/Column'; |
|
|
|
|
|
|
|
import type Model from '../../models/Model'; |
|
|
|
import type RollupColumn from '../../models/RollupColumn'; |
|
|
|
import type RollupColumn from '../../models/RollupColumn'; |
|
|
|
import type LinkToAnotherRecordColumn from '../../models/LinkToAnotherRecordColumn'; |
|
|
|
import type LinkToAnotherRecordColumn from '../../models/LinkToAnotherRecordColumn'; |
|
|
|
import type LookupColumn from '../../models/LookupColumn'; |
|
|
|
import type LookupColumn from '../../models/LookupColumn'; |
|
|
@ -633,8 +633,19 @@ async function _formulaQueryBuilder( |
|
|
|
`${pt.callee.name}(${( |
|
|
|
`${pt.callee.name}(${( |
|
|
|
await Promise.all( |
|
|
|
await Promise.all( |
|
|
|
pt.arguments.map(async (arg) => { |
|
|
|
pt.arguments.map(async (arg) => { |
|
|
|
const query = (await fn(arg)).builder.toQuery(); |
|
|
|
let query = (await fn(arg)).builder.toQuery(); |
|
|
|
if (pt.callee.name === 'CONCAT') { |
|
|
|
if (pt.callee.name === 'CONCAT') { |
|
|
|
|
|
|
|
if (knex.clientType() !== 'sqlite3') { |
|
|
|
|
|
|
|
query = await convertDateFormatForConcat( |
|
|
|
|
|
|
|
arg, |
|
|
|
|
|
|
|
columnIdToUidt, |
|
|
|
|
|
|
|
query, |
|
|
|
|
|
|
|
knex.clientType() |
|
|
|
|
|
|
|
); |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
// sqlite3: special handling - See BinaryExpression
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (knex.clientType() === 'mysql2') { |
|
|
|
if (knex.clientType() === 'mysql2') { |
|
|
|
// mysql2: CONCAT() returns NULL if any argument is NULL.
|
|
|
|
// mysql2: CONCAT() returns NULL if any argument is NULL.
|
|
|
|
// adding IFNULL to convert NULL values to empty strings
|
|
|
|
// adding IFNULL to convert NULL values to empty strings
|
|
|
@ -646,9 +657,9 @@ async function _formulaQueryBuilder( |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
return query; |
|
|
|
return query; |
|
|
|
}), |
|
|
|
}) |
|
|
|
) |
|
|
|
) |
|
|
|
).join()})${colAlias}`.replace(/\?/g, '\\?'),
|
|
|
|
).join()})${colAlias}`.replace(/\?/g, '\\?')
|
|
|
|
), |
|
|
|
), |
|
|
|
}; |
|
|
|
}; |
|
|
|
} else if (pt.type === 'Literal') { |
|
|
|
} else if (pt.type === 'Literal') { |
|
|
@ -679,8 +690,8 @@ async function _formulaQueryBuilder( |
|
|
|
pt.left.fnName = pt.left.fnName || 'ARITH'; |
|
|
|
pt.left.fnName = pt.left.fnName || 'ARITH'; |
|
|
|
pt.right.fnName = pt.right.fnName || 'ARITH'; |
|
|
|
pt.right.fnName = pt.right.fnName || 'ARITH'; |
|
|
|
|
|
|
|
|
|
|
|
const left = (await fn(pt.left, null, pt.operator)).builder.toQuery(); |
|
|
|
let left = (await fn(pt.left, null, pt.operator)).builder.toQuery(); |
|
|
|
const right = (await fn(pt.right, null, pt.operator)).builder.toQuery(); |
|
|
|
let right = (await fn(pt.right, null, pt.operator)).builder.toQuery(); |
|
|
|
let sql = `${left} ${pt.operator} ${right}${colAlias}`; |
|
|
|
let sql = `${left} ${pt.operator} ${right}${colAlias}`; |
|
|
|
|
|
|
|
|
|
|
|
// comparing a date with empty string would throw
|
|
|
|
// comparing a date with empty string would throw
|
|
|
@ -724,8 +735,22 @@ async function _formulaQueryBuilder( |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// handle NULL values when calling CONCAT for sqlite3
|
|
|
|
|
|
|
|
if (pt.left.fnName === 'CONCAT' && knex.clientType() === 'sqlite3') { |
|
|
|
if (pt.left.fnName === 'CONCAT' && knex.clientType() === 'sqlite3') { |
|
|
|
|
|
|
|
// handle date format
|
|
|
|
|
|
|
|
left = await convertDateFormatForConcat( |
|
|
|
|
|
|
|
pt.left?.arguments?.[0], |
|
|
|
|
|
|
|
columnIdToUidt, |
|
|
|
|
|
|
|
left, |
|
|
|
|
|
|
|
knex.clientType() |
|
|
|
|
|
|
|
); |
|
|
|
|
|
|
|
right = await convertDateFormatForConcat( |
|
|
|
|
|
|
|
pt.right?.arguments?.[0], |
|
|
|
|
|
|
|
columnIdToUidt, |
|
|
|
|
|
|
|
right, |
|
|
|
|
|
|
|
knex.clientType() |
|
|
|
|
|
|
|
); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// handle NULL values when calling CONCAT for sqlite3
|
|
|
|
sql = `COALESCE(${left}, '') ${pt.operator} COALESCE(${right},'')${colAlias}`; |
|
|
|
sql = `COALESCE(${left}, '') ${pt.operator} COALESCE(${right},'')${colAlias}`; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|