@budibase/backend-core 2.29.28 → 2.29.29

package/src/sql/utils.ts

@@ -22,6 +22,7 @@ export function getNativeSql(
   query: Knex.SchemaBuilder | Knex.QueryBuilder
 ): SqlQuery | SqlQuery[] {
   let sql = query.toSQL()
+
   if (Array.isArray(sql)) {
     return sql as SqlQuery[]
   }

package/dist/src/sql/sqlStatements.d.ts

@@ -1,16 +0,0 @@
-import { Table, FieldSchema } from "@budibase/types";
-import { Knex } from "knex";
-export declare class SqlStatements {
-    client: string;
-    table: Table;
-    allOr: boolean | undefined;
-    columnPrefix: string | undefined;
-    constructor(client: string, table: Table, { allOr, columnPrefix }?: {
-        allOr?: boolean;
-        columnPrefix?: string;
-    });
-    getField(key: string): FieldSchema | undefined;
-    between(query: Knex.QueryBuilder, key: string, low: number | string, high: number | string): Knex.QueryBuilder<any, any>;
-    lte(query: Knex.QueryBuilder, key: string, low: number | string): Knex.QueryBuilder<any, any>;
-    gte(query: Knex.QueryBuilder, key: string, high: number | string): Knex.QueryBuilder<any, any>;
-}

package/dist/src/sql/sqlStatements.js

@@ -1,66 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SqlStatements = void 0;
-const types_1 = require("@budibase/types");
-class SqlStatements {
-    constructor(client, table, { allOr, columnPrefix } = {}) {
-        this.client = client;
-        this.table = table;
-        this.allOr = allOr;
-        this.columnPrefix = columnPrefix;
-    }
-    getField(key) {
-        const fieldName = key.split(".")[1];
-        let found = this.table.schema[fieldName];
-        if (!found && this.columnPrefix) {
-            const prefixRemovedFieldName = fieldName.replace(this.columnPrefix, "");
-            found = this.table.schema[prefixRemovedFieldName];
-        }
-        return found;
-    }
-    between(query, key, low, high) {
-        // Use a between operator if we have 2 valid range values
-        const field = this.getField(key);
-        if ((field === null || field === void 0 ? void 0 : field.type) === types_1.FieldType.BIGINT &&
-            this.client === types_1.SqlClient.SQL_LITE) {
-            query = query.whereRaw(`CAST(${key} AS INTEGER) BETWEEN CAST(? AS INTEGER) AND CAST(? AS INTEGER)`, [low, high]);
-        }
-        else {
-            const fnc = this.allOr ? "orWhereBetween" : "whereBetween";
-            query = query[fnc](key, [low, high]);
-        }
-        return query;
-    }
-    lte(query, key, low) {
-        // Use just a single greater than operator if we only have a low
-        const field = this.getField(key);
-        if ((field === null || field === void 0 ? void 0 : field.type) === types_1.FieldType.BIGINT &&
-            this.client === types_1.SqlClient.SQL_LITE) {
-            query = query.whereRaw(`CAST(${key} AS INTEGER) >= CAST(? AS INTEGER)`, [
-                low,
-            ]);
-        }
-        else {
-            const fnc = this.allOr ? "orWhere" : "where";
-            query = query[fnc](key, ">=", low);
-        }
-        return query;
-    }
-    gte(query, key, high) {
-        const field = this.getField(key);
-        // Use just a single less than operator if we only have a high
-        if ((field === null || field === void 0 ? void 0 : field.type) === types_1.FieldType.BIGINT &&
-            this.client === types_1.SqlClient.SQL_LITE) {
-            query = query.whereRaw(`CAST(${key} AS INTEGER) <= CAST(? AS INTEGER)`, [
-                high,
-            ]);
-        }
-        else {
-            const fnc = this.allOr ? "orWhere" : "where";
-            query = query[fnc](key, "<=", high);
-        }
-        return query;
-    }
-}
-exports.SqlStatements = SqlStatements;
-//# sourceMappingURL=sqlStatements.js.map

package/dist/src/sql/sqlStatements.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"sqlStatements.js","sourceRoot":"","sources":["../../../src/sql/sqlStatements.ts"],"names":[],"mappings":"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"}

package/src/sql/sqlStatements.ts

@@ -1,87 +0,0 @@
-import { FieldType, Table, FieldSchema, SqlClient } from "@budibase/types"
-import { Knex } from "knex"
-
-export class SqlStatements {
-  client: string
-  table: Table
-  allOr: boolean | undefined
-  columnPrefix: string | undefined
-
-  constructor(
-    client: string,
-    table: Table,
-    { allOr, columnPrefix }: { allOr?: boolean; columnPrefix?: string } = {}
-  ) {
-    this.client = client
-    this.table = table
-    this.allOr = allOr
-    this.columnPrefix = columnPrefix
-  }
-
-  getField(key: string): FieldSchema | undefined {
-    const fieldName = key.split(".")[1]
-    let found = this.table.schema[fieldName]
-    if (!found && this.columnPrefix) {
-      const prefixRemovedFieldName = fieldName.replace(this.columnPrefix, "")
-      found = this.table.schema[prefixRemovedFieldName]
-    }
-    return found
-  }
-
-  between(
-    query: Knex.QueryBuilder,
-    key: string,
-    low: number | string,
-    high: number | string
-  ) {
-    // Use a between operator if we have 2 valid range values
-    const field = this.getField(key)
-    if (
-      field?.type === FieldType.BIGINT &&
-      this.client === SqlClient.SQL_LITE
-    ) {
-      query = query.whereRaw(
-        `CAST(${key} AS INTEGER) BETWEEN CAST(? AS INTEGER) AND CAST(? AS INTEGER)`,
-        [low, high]
-      )
-    } else {
-      const fnc = this.allOr ? "orWhereBetween" : "whereBetween"
-      query = query[fnc](key, [low, high])
-    }
-    return query
-  }
-
-  lte(query: Knex.QueryBuilder, key: string, low: number | string) {
-    // Use just a single greater than operator if we only have a low
-    const field = this.getField(key)
-    if (
-      field?.type === FieldType.BIGINT &&
-      this.client === SqlClient.SQL_LITE
-    ) {
-      query = query.whereRaw(`CAST(${key} AS INTEGER) >= CAST(? AS INTEGER)`, [
-        low,
-      ])
-    } else {
-      const fnc = this.allOr ? "orWhere" : "where"
-      query = query[fnc](key, ">=", low)
-    }
-    return query
-  }
-
-  gte(query: Knex.QueryBuilder, key: string, high: number | string) {
-    const field = this.getField(key)
-    // Use just a single less than operator if we only have a high
-    if (
-      field?.type === FieldType.BIGINT &&
-      this.client === SqlClient.SQL_LITE
-    ) {
-      query = query.whereRaw(`CAST(${key} AS INTEGER) <= CAST(? AS INTEGER)`, [
-        high,
-      ])
-    } else {
-      const fnc = this.allOr ? "orWhere" : "where"
-      query = query[fnc](key, "<=", high)
-    }
-    return query
-  }
-}