From 1ba472600705d86ce3a90bf8d2286e8e62d97117 Mon Sep 17 00:00:00 2001 From: Pranav C Date: Mon, 6 Mar 2023 11:27:40 +0530 Subject: [PATCH] refactor: wrap switch case Signed-off-by: Pranav C --- .../db/sql-data-mapper/lib/sql/conditionV2.ts | 65 ++++++++++--------- 1 file changed, 36 insertions(+), 29 deletions(-) diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/conditionV2.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/conditionV2.ts index 25142bf786..b0582abd0d 100644 --- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/conditionV2.ts +++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/conditionV2.ts @@ -576,49 +576,56 @@ const parseConditionV2 = async ( } } break; - case 'gt': { - const gt_op = customWhereClause ? '<' : '>'; - qb = qb.where(field, gt_op, val); - if (column.uidt === UITypes.Rating) { - // unset rating is considered as NULL - if (gt_op === '<' && val > 0) { - qb = qb.orWhereNull(field); + case 'gt': + { + const gt_op = customWhereClause ? '<' : '>'; + qb = qb.where(field, gt_op, val); + if (column.uidt === UITypes.Rating) { + // unset rating is considered as NULL + if (gt_op === '<' && val > 0) { + qb = qb.orWhereNull(field); + } } } break; } case 'ge': - case 'gte': { - const ge_op = customWhereClause ? '<=' : '>='; - qb = qb.where(field, ge_op, val); - if (column.uidt === UITypes.Rating) { - // unset rating is considered as NULL - if (ge_op === '<=' || (ge_op === '>=' && val === 0)) { - qb = qb.orWhereNull(field); + case 'gte': + { + const ge_op = customWhereClause ? '<=' : '>='; + qb = qb.where(field, ge_op, val); + if (column.uidt === UITypes.Rating) { + // unset rating is considered as NULL + if (ge_op === '<=' || (ge_op === '>=' && val === 0)) { + qb = qb.orWhereNull(field); + } } } break; - } - case 'lt': { - const lt_op = customWhereClause ? '>' : '<'; - qb = qb.where(field, lt_op, val); - if (column.uidt === UITypes.Rating) { - // unset number is considered as NULL - if (lt_op === '<' && val > 0) { - qb = qb.orWhereNull(field); + }case 'lt': + { + const lt_op = customWhereClause ? '>' : '<'; + qb = qb.where(field, lt_op, val); + if (column.uidt === UITypes.Rating) { + // unset number is considered as NULL + if (lt_op === '<' && val > 0) { + qb = qb.orWhereNull(field); + } } } break; } case 'le': - case 'lte': { - const le_op = customWhereClause ? '>=' : '<='; - qb = qb.where(field, le_op, val); - if (column.uidt === UITypes.Rating) { - // unset number is considered as NULL - if (le_op === '<=' || (le_op === '>=' && val === 0)) { - qb = qb.orWhereNull(field); + case 'lte': + { + const le_op = customWhereClause ? '>=' : '<='; + qb = qb.where(field, le_op, val); + if (column.uidt === UITypes.Rating) { + // unset number is considered as NULL + if (le_op === '<=' || (le_op === '>=' && val === 0)) { + qb = qb.orWhereNull(field); + } } } break;