@budibase/server 1.0.91-alpha.6 → 1.0.93

package/dist/api/controllers/query/import/index.js

@@ -13,7 +13,6 @@ exports.RestImporter = void 0;
 const validation_1 = require("../validation");
 const utils_1 = require("../../../../db/utils");
 const openapi2_1 = require("./sources/openapi2");
-const openapi3_1 = require("./sources/openapi3");
 const curl_1 = require("./sources/curl");
 // @ts-ignore
 const context_1 = require("@budibase/backend-core/context");
@@ -72,7 +71,7 @@ class RestImporter {
             };
         });
         this.data = data;
-        this.sources = [new openapi2_1.OpenAPI2(), new openapi3_1.OpenAPI3(), new curl_1.Curl()];
+        this.sources = [new openapi2_1.OpenAPI2(), new curl_1.Curl()];
     }
 }
 exports.RestImporter = RestImporter;

package/dist/api/controllers/query/import/sources/base/index.js

@@ -17,18 +17,7 @@ class ImportSource {
             const transformer = "return data";
             const schema = {};
             path = this.processPath(path);
-            if (url) {
-                if (typeof url === "string") {
-                    path = `${url}/${path}`;
-                }
-                else {
-                    let href = url.href;
-                    if (href.endsWith("/")) {
-                        href = href.slice(0, -1);
-                    }
-                    path = `${href}/${path}`;
-                }
-            }
+            path = `${url.origin}/${path}`;
             queryString = this.processQuery(queryString);
             const requestBody = JSON.stringify(body, null, 2);
             const query = {

package/dist/api/controllers/query/import/sources/curl.js

@@ -79,7 +79,7 @@ class Curl extends base_1.ImportSource {
         this.getQueries = (datasourceId) => __awaiter(this, void 0, void 0, function* () {
             const url = this.getUrl();
             const name = url.pathname;
-            const path = url.origin + url.pathname;
+            const path = url.pathname;
             const method = this.curl.method;
             const queryString = url.search;
             const headers = this.curl.headers;
@@ -88,7 +88,7 @@ class Curl extends base_1.ImportSource {
             if (cookieHeader) {
                 headers["Cookie"] = cookieHeader;
             }
-            const query = this.constructQuery(datasourceId, name, method, path, undefined, queryString, headers, [], requestBody);
+            const query = this.constructQuery(datasourceId, name, method, path, url, queryString, headers, [], requestBody);
             return [query];
         });
     }

package/dist/api/controllers/row/internal.js

@@ -91,8 +91,7 @@ exports.patch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const isUserTable = tableId === InternalTables.USER_METADATA;
     let oldRow;
     try {
-        let dbTable = yield db.get(tableId);
-        oldRow = yield outputProcessing(dbTable, yield findRow(ctx, tableId, inputs._id));
+        oldRow = yield db.get(inputs._id);
     }
     catch (err) {
         if (isUserTable) {

package/dist/automations/utils.js

@@ -29,6 +29,7 @@ exports.processEvent = (job) => __awaiter(void 0, void 0, void 0, function* () {
     }
     catch (err) {
         console.error(`${job.data.automation.appId} automation ${job.data.automation._id} was unable to run - ${err}`);
+        console.trace(err);
         return { err };
     }
 });

package/dist/definitions/datasource.js

@@ -50,7 +50,6 @@ var SourceNames;
     SourceNames["REST"] = "REST";
     SourceNames["ORACLE"] = "ORACLE";
     SourceNames["GOOGLE_SHEETS"] = "GOOGLE_SHEETS";
-    SourceNames["FIREBASE"] = "FIREBASE";
 })(SourceNames = exports.SourceNames || (exports.SourceNames = {}));
 var IncludeRelationships;
 (function (IncludeRelationships) {

package/dist/integrations/base/sql.js

@@ -30,8 +30,11 @@ function parse(input) {
     if (typeof input !== "string") {
         return input;
     }
-    if (input === MAX_ISO_DATE || input === MIN_ISO_DATE) {
-        return null;
+    if (input === MAX_ISO_DATE) {
+        return new Date(8640000000000000);
+    }
+    if (input === MIN_ISO_DATE) {
+        return new Date(-8640000000000000);
     }
     if (utils_1.isIsoDateString(input)) {
         return new Date(input);
@@ -120,21 +123,11 @@ class InternalBuilder {
         }
         if (filters.range) {
             iterate(filters.range, (key, value) => {
-                if (value.low && value.high) {
-                    // Use a between operator if we have 2 valid range values
-                    const fnc = allOr ? "orWhereBetween" : "whereBetween";
-                    query = query[fnc](key, [value.low, value.high]);
-                }
-                else if (value.low) {
-                    // Use just a single greater than operator if we only have a low
-                    const fnc = allOr ? "orWhere" : "where";
-                    query = query[fnc](key, ">", value.low);
-                }
-                else if (value.high) {
-                    // Use just a single less than operator if we only have a high
-                    const fnc = allOr ? "orWhere" : "where";
-                    query = query[fnc](key, "<", value.high);
+                if (!value.high || !value.low) {
+                    return;
                 }
+                const fnc = allOr ? "orWhereBetween" : "whereBetween";
+                query = query[fnc](key, [value.low, value.high]);
             });
         }
         if (filters.equal) {

package/dist/integrations/index.js

@@ -11,7 +11,6 @@ const mysql = require("./mysql");
 const arangodb = require("./arangodb");
 const rest = require("./rest");
 const googlesheets = require("./googlesheets");
-const firebase = require("./firebase");
 const { SourceNames } = require("../definitions/datasource");
 const environment = require("../environment");
 const DEFINITIONS = {
@@ -26,7 +25,6 @@ const DEFINITIONS = {
     [SourceNames.MYSQL]: mysql.schema,
     [SourceNames.ARANGODB]: arangodb.schema,
     [SourceNames.REST]: rest.schema,
-    [SourceNames.FIREBASE]: firebase.schema,
 };
 const INTEGRATIONS = {
     [SourceNames.POSTGRES]: postgres.integration,
@@ -40,7 +38,6 @@ const INTEGRATIONS = {
     [SourceNames.MYSQL]: mysql.integration,
     [SourceNames.ARANGODB]: arangodb.integration,
     [SourceNames.REST]: rest.integration,
-    [SourceNames.FIREBASE]: firebase.integration,
 };
 // optionally add oracle integration if the oracle binary can be installed
 if (!(process.arch === "arm64" && process.platform === "darwin")) {

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.91-alpha.5",
+    "version": "1.0.92",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -71,13 +71,12 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "^10.0.3",
-        "@budibase/backend-core": "^1.0.91-alpha.5",
-        "@budibase/client": "^1.0.91-alpha.5",
-        "@budibase/string-templates": "^1.0.91-alpha.5",
+        "@budibase/backend-core": "^1.0.92",
+        "@budibase/client": "^1.0.92",
+        "@budibase/string-templates": "^1.0.92",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",
-        "@google-cloud/firestore": "^5.0.2",
         "@koa/router": "8.0.0",
         "@sendgrid/mail": "7.1.1",
         "@sentry/node": "^6.0.0",

package/dist/threads/automation.js

@@ -9,15 +9,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 require("./utils").threadSetup();
-const env = require("../environment");
 const actions = require("../automations/actions");
 const automationUtils = require("../automations/automationUtils");
 const AutomationEmitter = require("../events/AutomationEmitter");
 const { processObject } = require("@budibase/string-templates");
 const { DEFAULT_TENANT_ID } = require("@budibase/backend-core/constants");
-const { DocumentTypes, isDevAppID } = require("../db/utils");
+const { DocumentTypes } = require("../db/utils");
 const { doInTenant } = require("@budibase/backend-core/tenancy");
-const usage = require("../utilities/usageQuota");
 const { definitions: triggerDefs } = require("../automations/triggerInfo");
 const { doInAppContext, getAppDB } = require("@budibase/backend-core/context");
 const FILTER_STEP_ID = actions.ACTION_DEFINITIONS.FILTER.stepId;
@@ -123,10 +121,6 @@ class Orchestrator {
                     return err;
                 }
             }
-            // Increment quota for automation runs
-            if (!env.SELF_HOSTED && !isDevAppID(this._appId)) {
-                yield usage.update(usage.Properties.AUTOMATION, 1);
-            }
             return this.executionOutput;
         });
     }