Browse Source

fix: cast to date only if arg type is non-date type

pull/7268/head
Pranav C 11 months ago
parent
commit
f1e8a0a991
  1. 3
      packages/nocodb/src/db/functionMappings/pg.ts

3
packages/nocodb/src/db/functionMappings/pg.ts

@ -3,6 +3,7 @@ import commonFns from './commonFns';
import type { MapFnArgs } from '../mapFunctionName'; import type { MapFnArgs } from '../mapFunctionName';
import { convertUnits } from '~/helpers/convertUnits'; import { convertUnits } from '~/helpers/convertUnits';
import { getWeekdayByText } from '~/helpers/formulaFnHelper'; import { getWeekdayByText } from '~/helpers/formulaFnHelper';
import {FormulaDataTypes} from "nocodb-sdk";
const replaceCharClassShorthandlers = (str: string) => { const replaceCharClassShorthandlers = (str: string) => {
return str.replace(/(.|^)\\([dDsSwW])/g, (fullMatch, prevChar, alias) => { return str.replace(/(.|^)\\([dDsSwW])/g, (fullMatch, prevChar, alias) => {
if (prevChar === '\\') return fullMatch; if (prevChar === '\\') return fullMatch;
@ -76,7 +77,7 @@ const pg = {
return { return {
builder: knex.raw( builder: knex.raw(
`(${(await fn(pt.arguments[0])).builder})${ `(${(await fn(pt.arguments[0])).builder})${
pt.arguments[0].type !== 'DATE' ? '::DATE' : '' pt.arguments[0].dataType !== FormulaDataTypes.DATE ? '::DATE' : ''
} + (${(await fn(pt.arguments[1])).builder} || } + (${(await fn(pt.arguments[1])).builder} ||
'${String((await fn(pt.arguments[2])).builder).replace( '${String((await fn(pt.arguments[2])).builder).replace(
/["']/g, /["']/g,

Loading…
Cancel
Save