@dascompany/database 2.1.2 → 2.1.4

package/dist/query/QueryOptions.js

@@ -3,10 +3,10 @@ import Filters from "../utils/Filters";
 import Parameters from "../utils/Parameters";
 export default class QueryOptions {
     static correctingSorting(querySortBy) {
-        const sortBy = Parameters.correct(querySortBy, { type: ParameterType.arrayObject });
+        const orderBy = Parameters.correct(querySortBy, { type: ParameterType.arrayObject });
         const table = [];
-        if (sortBy[0]) {
-            sortBy.forEach((element) => {
+        if (orderBy[0]) {
+            orderBy.forEach((element) => {
                 const key = Parameters.correct(element.key, { type: ParameterType.string, filter: Filters.databaseColumn });
                 const order = Parameters.correct(element.order, { type: ParameterType.string });
                 table.push({ key, order });

package/dist/query/QueryParamCreator.js

@@ -61,7 +61,9 @@ export default class QueryParamCreator {
     }
     static getBaseTypeForComplexType(paramType) {
         switch (paramType) {
-            case ParameterType.arrayNumber || ParameterType.betweenNumber:
+            case ParameterType.arrayNumber:
+                return ParameterType.number;
+            case ParameterType.betweenNumber:
                 return ParameterType.number;
             case ParameterType.arrayString:
                 return ParameterType.string;

package/dist/query/QueryParams.d.ts

@@ -3,7 +3,7 @@ import QueryOptionsI from '../types/QueryOptionsI';
 export default class QueryParams {
     private static where;
     private static params;
-    private static order;
+    private static orderBy;
     private static limit;
     private static values;
     private static paramConnector;

package/dist/query/QueryParams.js

@@ -3,15 +3,15 @@ import QueryParamsCreator from './QueryParamCreator';
 export default class QueryParams {
     static where = '$WHERE';
     static params = '$PARAMS';
-    static order = '$ORDERBY';
+    static orderBy = '$ORDERBY';
     static limit = '$LIMIT';
     static values = '$VALUES';
     static paramConnector = 'AND';
     static createParams(queryString, options) {
         if (options.where && (queryString.includes(this.where) || queryString.includes(this.params)))
             queryString = QueryParams.createWhereParams(queryString, options.where);
-        if (options && queryString.includes(this.order))
-            queryString = QueryParams.createOrderParams(queryString, options.order);
+        if (options && queryString.includes(this.orderBy))
+            queryString = QueryParams.createOrderParams(queryString, options.orderBy);
         if (options && queryString.includes(this.limit))
             queryString = QueryParams.createLimitParams(queryString, options.limit);
         if (options.values && queryString.includes(this.values))
@@ -63,16 +63,16 @@ export default class QueryParams {
             throw new Error(`Brak zmiennej: ${this.where} lub ${this.params} w zapytaniu sql`);
         return sqlWithParams;
     }
-    static createOrderParams(sql, order) {
-        if (order) {
+    static createOrderParams(sql, orderBy) {
+        if (orderBy) {
             let strToReplace = `ORDER BY `;
-            order.forEach(item => {
+            orderBy.forEach(item => {
                 strToReplace += `${item.key} ${item.order} `;
             });
-            sql = sql.replaceAll(this.order, strToReplace);
+            sql = sql.replaceAll(this.orderBy, strToReplace);
         }
         else
-            sql = sql.replaceAll(this.order, '');
+            sql = sql.replaceAll(this.orderBy, '');
         return sql;
     }
     static createLimitParams(sql, resultLimitation) {

package/dist/types/QueryOptionsI.d.ts

@@ -4,7 +4,7 @@ import ResultLimitationI from "./ResultLimitationI";
 import WhereOptionI from "./WhereOptionI";
 export default interface QueryOptionsI {
     where?: WhereOptionI;
-    order?: OrderByI[];
+    orderBy?: OrderByI[];
     limit?: ResultLimitationI;
     values?: ParameterI[];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dascompany/database",
-  "version": "2.1.2",
+  "version": "2.1.4",
   "main": "dist/index.js",
   "scripts": {
     "test": "vitest",