@ruiapp/rapid-core 0.8.18 → 0.8.19

package/dist/dataAccess/dataAccessTypes.d.ts

@@ -2,7 +2,7 @@ export type DataAccessPgColumnTypes = "int4" | "int8" | "float4" | "float8" | "d
 export type RowFilterRelationalOperators = "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "matches" | "matchesCS" | "contains" | "notContains" | "containsCS" | "notContainsCS" | "startsWith" | "notStartsWith" | "endsWith" | "notEndsWith";
 export type RowFilterArrayOperators = "arrayContains" | "arrayOverlap";
 export type RowFilterSetOperators = "in" | "notIn";
-export type RowFilterRangeOperators = "between";
+export type RowFilterRangeOperators = "between" | "range";
 export type RowFilterLogicalOperators = "or" | "and";
 export type RowFilterUnaryOperators = "null" | "notNull";
 export type RowFilterExistenceOperators = "exists" | "notExists";

package/dist/index.js

@@ -519,7 +519,7 @@ function buildFilterQuery(level, ctx, filter) {
     else if (operator === "in" || operator === "notIn") {
         return buildInFilterQuery(ctx, filter);
     }
-    else if (operator === "between") {
+    else if (operator === "between" || operator === "range") {
         return buildRangeFilterQuery(ctx, filter);
     }
     else if (operator === "matches") {
@@ -607,11 +607,12 @@ function buildInFilterQuery(ctx, filter) {
     return command;
 }
 function buildRangeFilterQuery(ctx, filter) {
-    let command = ctx.builder.quoteColumn(ctx.model, filter.field, ctx.emitTableAlias);
+    let command = "";
+    if (filter.value.length != 2) {
+        throw new Error(`Filter operator '${filter.operator}' need two values.`);
+    }
     if (filter.operator === "between") {
-        if (filter.value.length != 2) {
-            throw new Error(`Filter operator '${filter.operator}' need two values.`);
-        }
+        command += ctx.builder.quoteColumn(ctx.model, filter.field, ctx.emitTableAlias);
         command += " BETWEEN ";
         ctx.params.push(filter.value[0]);
         command += `$${ctx.params.length}`;
@@ -619,6 +620,13 @@ function buildRangeFilterQuery(ctx, filter) {
         ctx.params.push(filter.value[1]);
         command += `$${ctx.params.length}`;
     }
+    else if (filter.operator === "range") {
+        ctx.params.push(filter.value[0]);
+        command += `(${ctx.builder.quoteColumn(ctx.model, filter.field, ctx.emitTableAlias)} >= $${ctx.params.length}`;
+        command += " AND ";
+        ctx.params.push(filter.value[1]);
+        command += `${ctx.builder.quoteColumn(ctx.model, filter.field, ctx.emitTableAlias)} < $${ctx.params.length})`;
+    }
     else {
         throw new Error(`Filter operator '${filter.operator}' is not supported.`);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ruiapp/rapid-core",
-  "version": "0.8.18",
+  "version": "0.8.19",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/dataAccess/dataAccessTypes.ts

@@ -34,7 +34,7 @@ export type RowFilterArrayOperators = "arrayContains" | "arrayOverlap";
 
 export type RowFilterSetOperators = "in" | "notIn";
 
-export type RowFilterRangeOperators = "between";
+export type RowFilterRangeOperators = "between" | "range";
 
 export type RowFilterLogicalOperators = "or" | "and";
 

package/src/queryBuilder/queryBuilder.ts

@@ -418,7 +418,7 @@ function buildFilterQuery(level: number, ctx: BuildQueryContext, filter: RowFilt
     return buildUnaryFilterQuery(ctx, filter);
   } else if (operator === "in" || operator === "notIn") {
     return buildInFilterQuery(ctx, filter);
-  } else if (operator === "between") {
+  } else if (operator === "between" || operator === "range") {
     return buildRangeFilterQuery(ctx, filter);
   } else if (operator === "matches") {
     return buildMatchesFilterQuery(ctx, filter);
@@ -498,12 +498,14 @@ function buildInFilterQuery(ctx: BuildQueryContext, filter: FindRowSetFilterOpti
 }
 
 function buildRangeFilterQuery(ctx: BuildQueryContext, filter: FindRowRangeFilterOptions) {
-  let command = ctx.builder.quoteColumn(ctx.model, filter.field, ctx.emitTableAlias);
+  let command = "";
+
+  if (filter.value.length != 2) {
+    throw new Error(`Filter operator '${filter.operator}' need two values.`);
+  }
 
   if (filter.operator === "between") {
-    if (filter.value.length != 2) {
-      throw new Error(`Filter operator '${filter.operator}' need two values.`);
-    }
+    command += ctx.builder.quoteColumn(ctx.model, filter.field, ctx.emitTableAlias);
 
     command += " BETWEEN ";
 
@@ -514,6 +516,14 @@ function buildRangeFilterQuery(ctx: BuildQueryContext, filter: FindRowRangeFilte
 
     ctx.params.push(filter.value[1]);
     command += `$${ctx.params.length}`;
+  } else if (filter.operator === "range") {
+    ctx.params.push(filter.value[0]);
+    command += `(${ctx.builder.quoteColumn(ctx.model, filter.field, ctx.emitTableAlias)} >= $${ctx.params.length}`;
+
+    command += " AND ";
+
+    ctx.params.push(filter.value[1]);
+    command += `${ctx.builder.quoteColumn(ctx.model, filter.field, ctx.emitTableAlias)} < $${ctx.params.length})`;
   } else {
     throw new Error(`Filter operator '${filter.operator}' is not supported.`);
   }