|
|
@ -1,13 +1,13 @@ |
|
|
|
import Filter from '../../../../models/Filter'; |
|
|
|
import Filter from '../../../../models/Filter'; |
|
|
|
import LinkToAnotherRecordColumn from '../../../../models/LinkToAnotherRecordColumn'; |
|
|
|
import type LinkToAnotherRecordColumn from '../../../../models/LinkToAnotherRecordColumn'; |
|
|
|
import { Knex } from 'knex'; |
|
|
|
import type { Knex } from 'knex'; |
|
|
|
import { XKnex } from '../../index'; |
|
|
|
import type { XKnex } from '../../index'; |
|
|
|
import Column from '../../../../models/Column'; |
|
|
|
import type Column from '../../../../models/Column'; |
|
|
|
import LookupColumn from '../../../../models/LookupColumn'; |
|
|
|
import type LookupColumn from '../../../../models/LookupColumn'; |
|
|
|
import genRollupSelectv2 from './genRollupSelectv2'; |
|
|
|
import genRollupSelectv2 from './genRollupSelectv2'; |
|
|
|
import RollupColumn from '../../../../models/RollupColumn'; |
|
|
|
import type RollupColumn from '../../../../models/RollupColumn'; |
|
|
|
import formulaQueryBuilderv2 from './formulav2/formulaQueryBuilderv2'; |
|
|
|
import formulaQueryBuilderv2 from './formulav2/formulaQueryBuilderv2'; |
|
|
|
import FormulaColumn from '../../../../models/FormulaColumn'; |
|
|
|
import type FormulaColumn from '../../../../models/FormulaColumn'; |
|
|
|
import { isNumericCol, RelationTypes, UITypes } from 'nocodb-sdk'; |
|
|
|
import { isNumericCol, RelationTypes, UITypes } from 'nocodb-sdk'; |
|
|
|
import { sanitize } from './helpers/sanitize'; |
|
|
|
import { sanitize } from './helpers/sanitize'; |
|
|
|
import dayjs, { extend } from 'dayjs'; |
|
|
|
import dayjs, { extend } from 'dayjs'; |
|
|
@ -588,7 +588,6 @@ const parseConditionV2 = async ( |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
break; |
|
|
|
break; |
|
|
|
} |
|
|
|
|
|
|
|
case 'ge': |
|
|
|
case 'ge': |
|
|
|
case 'gte': |
|
|
|
case 'gte': |
|
|
|
{ |
|
|
|
{ |
|
|
@ -602,7 +601,7 @@ const parseConditionV2 = async ( |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
break; |
|
|
|
break; |
|
|
|
}case 'lt': |
|
|
|
case 'lt': |
|
|
|
{ |
|
|
|
{ |
|
|
|
const lt_op = customWhereClause ? '>' : '<'; |
|
|
|
const lt_op = customWhereClause ? '>' : '<'; |
|
|
|
qb = qb.where(field, lt_op, val); |
|
|
|
qb = qb.where(field, lt_op, val); |
|
|
@ -614,7 +613,6 @@ const parseConditionV2 = async ( |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
break; |
|
|
|
break; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
case 'le': |
|
|
|
case 'le': |
|
|
|
case 'lte': |
|
|
|
case 'lte': |
|
|
@ -629,7 +627,6 @@ const parseConditionV2 = async ( |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
break; |
|
|
|
break; |
|
|
|
} |
|
|
|
|
|
|
|
case 'in': |
|
|
|
case 'in': |
|
|
|
qb = qb.whereIn( |
|
|
|
qb = qb.whereIn( |
|
|
|
field, |
|
|
|
field, |
|
|
|