@budibase/server 1.0.219-alpha.7 → 1.0.219

package/dist/api/controllers/application.js

@@ -33,8 +33,7 @@ const { getTenantId, isMultiTenant } = require("@budibase/backend-core/tenancy")
 const user_1 = require("./user");
 const { app: appCache } = require("@budibase/backend-core/cache");
 const utils_2 = require("../../automations/utils");
-const logging_1 = require("../../automations/logging");
-const { getAppDB, getProdAppDB, updateAppId, doInAppContext, } = require("@budibase/backend-core/context");
+const { getAppDB, getProdAppDB, updateAppId, } = require("@budibase/backend-core/context");
 const rows_1 = require("../../utilities/usageQuota/rows");
 const pro_1 = require("@budibase/pro");
 const backend_core_1 = require("@budibase/backend-core");
@@ -160,7 +159,7 @@ const fetch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
             }
         }
     }
-    ctx.body = yield (0, logging_1.checkAppMetadata)(apps);
+    ctx.body = apps;
 });
 exports.fetch = fetch;
 const fetchAppDefinition = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
@@ -487,21 +486,19 @@ const sync = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
 });
 exports.sync = sync;
 const updateAppPackage = (appPackage, appId) => __awaiter(void 0, void 0, void 0, function* () {
-    return doInAppContext(appId, () => __awaiter(void 0, void 0, void 0, function* () {
-        const db = getAppDB();
-        const application = yield db.get(utils_1.DocumentTypes.APP_METADATA);
-        const newAppPackage = Object.assign(Object.assign({}, application), appPackage);
-        if (appPackage._rev !== application._rev) {
-            newAppPackage._rev = application._rev;
-        }
-        // the locked by property is attached by server but generated from
-        // Redis, shouldn't ever store it
-        delete newAppPackage.lockedBy;
-        yield db.put(newAppPackage);
-        // remove any cached metadata, so that it will be updated
-        yield appCache.invalidateAppMetadata(appId);
-        return newAppPackage;
-    }));
+    const db = getAppDB();
+    const application = yield db.get(utils_1.DocumentTypes.APP_METADATA);
+    const newAppPackage = Object.assign(Object.assign({}, application), appPackage);
+    if (appPackage._rev !== application._rev) {
+        newAppPackage._rev = application._rev;
+    }
+    // the locked by property is attached by server but generated from
+    // Redis, shouldn't ever store it
+    delete newAppPackage.lockedBy;
+    yield db.put(newAppPackage);
+    // remove any cached metadata, so that it will be updated
+    yield appCache.invalidateAppMetadata(appId);
+    return newAppPackage;
 });
 const createEmptyAppPackage = (ctx, app) => __awaiter(void 0, void 0, void 0, function* () {
     const db = getAppDB();

package/dist/api/controllers/automation.js

@@ -10,15 +10,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 const actions = require("../../automations/actions");
 const triggers = require("../../automations/triggers");
-const { getAutomationParams, generateAutomationID, DocumentTypes, } = require("../../db/utils");
+const { getAutomationParams, generateAutomationID } = require("../../db/utils");
 const { checkForWebhooks, updateTestHistory, removeDeprecated, } = require("../../automations/utils");
 const { deleteEntityMetadata } = require("../../utilities");
 const { MetadataTypes } = require("../../constants");
 const { setTestFlag, clearTestFlag } = require("../../utilities/redis");
-const { getAppDB, getProdAppDB, doInAppContext, } = require("@budibase/backend-core/context");
+const { getAppDB } = require("@budibase/backend-core/context");
 const { events } = require("@budibase/backend-core");
-const { app } = require("@budibase/backend-core/cache");
-const { automations } = require("@budibase/pro");
 const ACTION_DEFS = removeDeprecated(actions.ACTION_DEFINITIONS);
 const TRIGGER_DEFS = removeDeprecated(triggers.TRIGGER_DEFINITIONS);
 /*************************
@@ -164,30 +162,6 @@ exports.destroy = function (ctx) {
         yield events.automation.deleted(oldAutomation);
     });
 };
-exports.logSearch = function (ctx) {
-    return __awaiter(this, void 0, void 0, function* () {
-        ctx.body = yield automations.logs.logSearch(ctx.request.body);
-    });
-};
-exports.clearLogError = function (ctx) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { automationId, appId } = ctx.request.body;
-        yield doInAppContext(appId, () => __awaiter(this, void 0, void 0, function* () {
-            const db = getProdAppDB();
-            const metadata = yield db.get(DocumentTypes.APP_METADATA);
-            if (!automationId) {
-                delete metadata.automationErrors;
-            }
-            else if (metadata.automationErrors &&
-                metadata.automationErrors[automationId]) {
-                delete metadata.automationErrors[automationId];
-            }
-            yield db.put(metadata);
-            yield app.invalidateAppMetadata(metadata.appId, metadata);
-            ctx.body = { message: `Error logs cleared.` };
-        }));
-    });
-};
 exports.getActionList = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         ctx.body = ACTION_DEFS;

package/dist/api/controllers/backup.js

@@ -13,12 +13,11 @@ const { events, context } = require("@budibase/backend-core");
 const { DocumentTypes } = require("../../db/utils");
 exports.exportAppDump = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        let { appId, excludeRows } = ctx.query;
+        const { appId } = ctx.query;
         const appName = decodeURI(ctx.query.appname);
-        excludeRows = excludeRows === "true";
         const backupIdentifier = `${appName}-export-${new Date().getTime()}.txt`;
         ctx.attachment(backupIdentifier);
-        ctx.body = yield streamBackup(appId, excludeRows);
+        ctx.body = yield streamBackup(appId);
         yield context.doInAppContext(appId, () => __awaiter(this, void 0, void 0, function* () {
             const appDb = context.getAppDB();
             const app = yield appDb.get(DocumentTypes.APP_METADATA);

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

@@ -20,8 +20,6 @@ const environment_1 = require("../../../environment");
 const context_1 = require("@budibase/backend-core/context");
 const pro_1 = require("@budibase/pro");
 const backend_core_1 = require("@budibase/backend-core");
-const utils_3 = require("@budibase/backend-core/utils");
-const constants_2 = require("@budibase/backend-core/constants");
 const Runner = new threads_1.Thread(threads_1.ThreadType.QUERY, {
     timeoutMs: environment_1.QUERY_THREAD_TIMEOUT || 10000,
 });
@@ -113,19 +111,6 @@ function find(ctx) {
     });
 }
 exports.find = find;
-//Required to discern between OIDC OAuth config entries
-function getOAuthConfigCookieId(ctx) {
-    if (ctx.user.providerType === constants_2.Configs.OIDC) {
-        return (0, utils_3.getCookie)(ctx, constants_2.Cookies.OIDC_CONFIG);
-    }
-}
-function getAuthConfig(ctx) {
-    const authCookie = (0, utils_3.getCookie)(ctx, constants_2.Cookies.Auth);
-    let authConfigCtx = {};
-    authConfigCtx["configId"] = getOAuthConfigCookieId(ctx);
-    authConfigCtx["sessionId"] = authCookie ? authCookie.sessionId : null;
-    return authConfigCtx;
-}
 function preview(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = (0, context_1.getAppDB)();
@@ -134,7 +119,6 @@ function preview(ctx) {
         // preview may not have a queryId as it hasn't been saved, but if it does
         // this stops dynamic variables from calling the same query
         const { fields, parameters, queryVerb, transformer, queryId } = query;
-        const authConfigCtx = getAuthConfig(ctx);
         try {
             const runFn = () => Runner.run({
                 appId: ctx.appId,
@@ -144,10 +128,6 @@ function preview(ctx) {
                 parameters,
                 transformer,
                 queryId,
-                ctx: {
-                    user: ctx.user,
-                    auth: Object.assign({}, authConfigCtx),
-                },
             });
             const { rows, keys, info, extra } = yield pro_1.quotas.addQuery(runFn);
             yield backend_core_1.events.query.previewed(datasource, query);
@@ -169,7 +149,6 @@ function execute(ctx, opts = { rowsOnly: false }) {
         const db = (0, context_1.getAppDB)();
         const query = yield db.get(ctx.params.queryId);
         const datasource = yield db.get(query.datasourceId);
-        const authConfigCtx = getAuthConfig(ctx);
         const enrichedParameters = ctx.request.body.parameters || {};
         // make sure parameters are fully enriched with defaults
         if (query && query.parameters) {
@@ -190,10 +169,6 @@ function execute(ctx, opts = { rowsOnly: false }) {
                 parameters: enrichedParameters,
                 transformer: query.transformer,
                 queryId: ctx.params.queryId,
-                ctx: {
-                    user: ctx.user,
-                    auth: Object.assign({}, authConfigCtx),
-                },
             });
             const { rows, pagination, extra } = yield pro_1.quotas.addQuery(runFn);
             if (opts && opts.rowsOnly) {

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

@@ -155,41 +155,29 @@ exports.validate = () => __awaiter(void 0, void 0, void 0, function* () {
     return { valid: true };
 });
 exports.exportRows = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const { datasourceId } = breakExternalTableId(ctx.params.tableId);
+    const { datasourceId, tableName } = breakExternalTableId(ctx.params.tableId);
     const db = getAppDB();
-    const format = ctx.query.format;
-    const { columns } = ctx.request.body;
+    let format = ctx.query.format;
     const datasource = yield db.get(datasourceId);
     if (!datasource || !datasource.entities) {
         ctx.throw(400, "Datasource has not been configured for plus API.");
     }
+    const tables = datasource.entities;
+    const table = tables[tableName];
     ctx.request.body = {
         query: {
             oneOf: {
-                _id: ctx.request.body.rows.map(row => JSON.parse(decodeURI(row))[0]),
+                [table.primaryDisplay]: ctx.request.body.rows.map(id => breakRowIdField(id)[0]),
             },
         },
     };
     let result = yield exports.search(ctx);
-    let rows = [];
-    // Filter data to only specified columns if required
-    if (columns && columns.length) {
-        for (let i = 0; i < result.rows.length; i++) {
-            rows[i] = {};
-            for (let column of columns) {
-                rows[i][column] = result.rows[i][column];
-            }
-        }
-    }
-    else {
-        rows = result.rows;
-    }
-    let headers = Object.keys(rows[0]);
+    let headers = Object.keys(result.rows[0]);
     const exporter = exporters[format];
     const filename = `export.${format}`;
     // send down the file
     ctx.attachment(filename);
-    return apiFileReturn(exporter(headers, rows));
+    return apiFileReturn(exporter(headers, result.rows));
 });
 exports.fetchEnrichedRow = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const id = ctx.params.rowId;

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

@@ -18,7 +18,7 @@ const { getAppId } = require("@budibase/backend-core/context");
  */
 class QueryBuilder {
     constructor(base) {
-        this.query = Object.assign({ string: {}, fuzzy: {}, range: {}, equal: {}, notEqual: {}, empty: {}, notEmpty: {}, oneOf: {} }, base);
+        this.query = Object.assign({ string: {}, fuzzy: {}, range: {}, equal: {}, notEqual: {}, empty: {}, notEmpty: {} }, base);
         this.limit = 50;
         this.sortOrder = "ascending";
         this.sortType = "string";
@@ -96,10 +96,6 @@ class QueryBuilder {
         this.query.notEmpty[key] = value;
         return this;
     }
-    addOneOf(key, value) {
-        this.query.oneOf[key] = value;
-        return this;
-    }
     /**
      * Preprocesses a value before going into a lucene search.
      * Transforms strings to lowercase and wraps strings and bools in quotes.
@@ -205,23 +201,6 @@ class QueryBuilder {
         if (this.query.notEmpty) {
             build(this.query.notEmpty, key => `${key}:["" TO *]`);
         }
-        if (this.query.oneOf) {
-            build(this.query.oneOf, (key, value) => {
-                if (!Array.isArray(value)) {
-                    if (typeof value === "string") {
-                        value = value.split(",");
-                    }
-                    else {
-                        return "";
-                    }
-                }
-                let orStatement = `${builder.preprocess(value[0], allPreProcessingOpts)}`;
-                for (let i = 1; i < value.length; i++) {
-                    orStatement += ` OR ${builder.preprocess(value[i], allPreProcessingOpts)}`;
-                }
-                return `${key}:(${orStatement})`;
-            });
-        }
         return query;
     }
     buildSearchBody() {

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

@@ -70,9 +70,6 @@ exports.validate = ({ tableId, row, table }) => __awaiter(void 0, void 0, void 0
         // Validate.js doesn't seem to handle array
         if (type === FieldTypes.ARRAY && row[fieldName]) {
             if (row[fieldName].length) {
-                if (!Array.isArray(row[fieldName])) {
-                    row[fieldName] = row[fieldName].split(",");
-                }
                 row[fieldName].map(val => {
                     if (!constraints.inclusion.includes(val) &&
                         constraints.inclusion.length !== 0) {

package/dist/api/index.js

@@ -69,10 +69,7 @@ router.use((ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
             error,
         };
         ctx.log.error(err);
-        // unauthorised errors don't provide a useful trace
-        if (!env.isTest()) {
-            console.trace(err);
-        }
+        console.trace(err);
     }
 }));
 // authenticated routes

package/dist/api/routes/automation.js

@@ -15,8 +15,6 @@ router
     .get("/api/automations/:id", paramResource("id"), authorized(BUILDER), controller.find)
     .put("/api/automations", bodyResource("_id"), authorized(BUILDER), automationValidator(true), controller.update)
     .post("/api/automations", authorized(BUILDER), automationValidator(false), controller.create)
-    .post("/api/automations/logs/search", authorized(BUILDER), controller.logSearch)
-    .delete("/api/automations/logs", authorized(BUILDER), controller.clearLogError)
     .delete("/api/automations/:id/:rev", paramResource("id"), authorized(BUILDER), controller.destroy)
     .post("/api/automations/:id/trigger", appInfoMiddleware({ appType: AppType.PROD }), paramResource("id"), authorized(PermissionTypes.AUTOMATION, PermissionLevels.EXECUTE), controller.trigger)
     .post("/api/automations/:id/test", appInfoMiddleware({ appType: AppType.DEV }), paramResource("id"), authorized(PermissionTypes.AUTOMATION, PermissionLevels.EXECUTE), controller.test);

package/dist/automations/automationUtils.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 const { getTable } = require("../api/controllers/table/utils");
-const { findHBSBlocks, decodeJSBinding, isJSBinding, encodeJSBinding, } = require("@budibase/string-templates");
+const { findHBSBlocks } = require("@budibase/string-templates");
 /**
  * When values are input to the system generally they will be of type string as this is required for template strings.
  * This can generate some odd scenarios as the Schema of the automation requires a number but the builder might supply
@@ -81,23 +81,11 @@ exports.getError = err => {
     return typeof err !== "string" ? err.toString() : err;
 };
 exports.substituteLoopStep = (hbsString, substitute) => {
-    let blocks = [];
-    let checkForJS = isJSBinding(hbsString);
-    if (checkForJS) {
-        hbsString = decodeJSBinding(hbsString);
-        blocks.push(hbsString);
-    }
-    else {
-        blocks = findHBSBlocks(hbsString);
-    }
+    let blocks = findHBSBlocks(hbsString);
     for (let block of blocks) {
+        let oldBlock = block;
         block = block.replace(/loop/, substitute);
-        if (checkForJS) {
-            hbsString = encodeJSBinding(block);
-        }
-        else {
-            hbsString = block;
-        }
+        hbsString = hbsString.replace(new RegExp(oldBlock, "g"), block);
     }
     return hbsString;
 };

package/dist/automations/steps/filter.js

@@ -56,55 +56,46 @@ exports.definition = {
         outputs: {
             properties: {
                 success: {
-                    type: "boolean",
-                    description: "Whether the action was successful",
-                },
-                result: {
                     type: "boolean",
                     description: "Whether the logic block passed",
                 },
             },
-            required: ["success", "result"],
+            required: ["success"],
         },
     },
 };
 exports.run = function filter({ inputs }) {
     return __awaiter(this, void 0, void 0, function* () {
-        try {
-            let { field, condition, value } = inputs;
-            // coerce types so that we can use them
-            if (!isNaN(value) && !isNaN(field)) {
-                value = parseFloat(value);
-                field = parseFloat(field);
-            }
-            else if (!isNaN(Date.parse(value)) && !isNaN(Date.parse(field))) {
-                value = Date.parse(value);
-                field = Date.parse(field);
-            }
-            let result = false;
-            if (typeof field !== "object" && typeof value !== "object") {
-                switch (condition) {
-                    case FilterConditions.EQUAL:
-                        result = field === value;
-                        break;
-                    case FilterConditions.NOT_EQUAL:
-                        result = field !== value;
-                        break;
-                    case FilterConditions.GREATER_THAN:
-                        result = field > value;
-                        break;
-                    case FilterConditions.LESS_THAN:
-                        result = field < value;
-                        break;
-                }
-            }
-            else {
-                result = false;
+        let { field, condition, value } = inputs;
+        // coerce types so that we can use them
+        if (!isNaN(value) && !isNaN(field)) {
+            value = parseFloat(value);
+            field = parseFloat(field);
+        }
+        else if (!isNaN(Date.parse(value)) && !isNaN(Date.parse(field))) {
+            value = Date.parse(value);
+            field = Date.parse(field);
+        }
+        let success = false;
+        if (typeof field !== "object" && typeof value !== "object") {
+            switch (condition) {
+                case FilterConditions.EQUAL:
+                    success = field === value;
+                    break;
+                case FilterConditions.NOT_EQUAL:
+                    success = field !== value;
+                    break;
+                case FilterConditions.GREATER_THAN:
+                    success = field > value;
+                    break;
+                case FilterConditions.LESS_THAN:
+                    success = field < value;
+                    break;
             }
-            return { success: true, result };
         }
-        catch (err) {
-            return { success: false, result: false };
+        else {
+            success = false;
         }
+        return { success };
     });
 };

package/dist/automations/triggers.js

@@ -95,7 +95,7 @@ exports.externalTrigger = function (automation, params, { getResponses } = {}) {
             // values are likely to be submitted as strings, so we shall convert to correct type
             const coercedFields = {};
             const fields = automation.definition.trigger.inputs.fields;
-            for (let key of Object.keys(fields || {})) {
+            for (let key of Object.keys(fields)) {
                 coercedFields[key] = coerce(params.fields[key], fields[key]);
             }
             params.fields = coercedFields;

package/dist/db/linkedRows/index.js

@@ -56,7 +56,6 @@ function getLinksForRows(rows) {
         // have to get unique as the previous table query can
         // return duplicates, could be querying for both tables in a relation
         return getUniqueByProp(responses
-            .filter(el => el != null)
             // create a unique ID which we can use for getting only unique ones
             .map(el => (Object.assign(Object.assign({}, el), { unique: el.id + el.thisId + el.fieldName }))), "unique");
     });

package/dist/db/utils.js

@@ -1,13 +1,39 @@
 "use strict";
 const newid = require("./newid");
-const { DocumentTypes: CoreDocTypes, getRoleParams, generateRoleID, APP_DEV_PREFIX, APP_PREFIX, SEPARATOR, StaticDatabases, isDevAppID, isProdAppID, getDevelopmentAppID, generateAppID, getQueryIndex, ViewNames, } = require("@budibase/backend-core/db");
+const { DocumentTypes: CoreDocTypes, getRoleParams, generateRoleID, APP_DEV_PREFIX, APP_PREFIX, SEPARATOR, StaticDatabases, isDevAppID, isProdAppID, getDevelopmentAppID, generateAppID, } = require("@budibase/backend-core/db");
 const UNICODE_MAX = "\ufff0";
 const AppStatus = {
     DEV: "development",
     ALL: "all",
     DEPLOYED: "published",
 };
-const DocumentTypes = Object.assign(Object.assign({}, CoreDocTypes), { TABLE: "ta", ROW: "ro", USER: "us", AUTOMATION: "au", LINK: "li", WEBHOOK: "wh", INSTANCE: "inst", LAYOUT: "layout", SCREEN: "screen", DATASOURCE: "datasource", DATASOURCE_PLUS: "datasource_plus", QUERY: "query", DEPLOYMENTS: "deployments", METADATA: "metadata", MEM_VIEW: "view", USER_FLAG: "flag" });
+const DocumentTypes = {
+    APP: CoreDocTypes.APP,
+    DEV: CoreDocTypes.DEV,
+    APP_DEV: CoreDocTypes.APP_DEV,
+    APP_METADATA: CoreDocTypes.APP_METADATA,
+    ROLE: CoreDocTypes.ROLE,
+    TABLE: "ta",
+    ROW: "ro",
+    USER: "us",
+    AUTOMATION: "au",
+    LINK: "li",
+    WEBHOOK: "wh",
+    INSTANCE: "inst",
+    LAYOUT: "layout",
+    SCREEN: "screen",
+    DATASOURCE: "datasource",
+    DATASOURCE_PLUS: "datasource_plus",
+    QUERY: "query",
+    DEPLOYMENTS: "deployments",
+    METADATA: "metadata",
+    MEM_VIEW: "view",
+    USER_FLAG: "flag",
+};
+const ViewNames = {
+    LINK: "by_link",
+    ROUTING: "screen_routes",
+};
 const InternalTables = {
     USER_METADATA: "ta_users",
 };
@@ -28,7 +54,6 @@ exports.isDevAppID = isDevAppID;
 exports.isProdAppID = isProdAppID;
 exports.USER_METDATA_PREFIX = `${DocumentTypes.ROW}${SEPARATOR}${InternalTables.USER_METADATA}${SEPARATOR}`;
 exports.LINK_USER_METADATA_PREFIX = `${DocumentTypes.LINK}${SEPARATOR}${InternalTables.USER_METADATA}${SEPARATOR}`;
-exports.TABLE_ROW_PREFIX = `${DocumentTypes.ROW}${SEPARATOR}${DocumentTypes.TABLE}`;
 exports.ViewNames = ViewNames;
 exports.InternalTables = InternalTables;
 exports.DocumentTypes = DocumentTypes;
@@ -41,7 +66,9 @@ exports.generateAppID = generateAppID;
 exports.generateDevAppID = getDevelopmentAppID;
 exports.generateRoleID = generateRoleID;
 exports.getRoleParams = getRoleParams;
-exports.getQueryIndex = getQueryIndex;
+exports.getQueryIndex = viewName => {
+    return `database/${viewName}`;
+};
 /**
  * If creating DB allDocs/query params with only a single top level ID this can be used, this
  * is usually the case as most of our docs are top level e.g. tables, automations, users and so on.

package/dist/definitions/datasource.js

@@ -52,7 +52,6 @@ var SourceNames;
     SourceNames["GOOGLE_SHEETS"] = "GOOGLE_SHEETS";
     SourceNames["FIRESTORE"] = "FIRESTORE";
     SourceNames["REDIS"] = "REDIS";
-    SourceNames["SNOWFLAKE"] = "SNOWFLAKE";
 })(SourceNames = exports.SourceNames || (exports.SourceNames = {}));
 var IncludeRelationships;
 (function (IncludeRelationships) {

package/dist/environment.js

@@ -66,7 +66,6 @@ module.exports = {
     ALLOW_DEV_AUTOMATIONS: process.env.ALLOW_DEV_AUTOMATIONS,
     DISABLE_THREADING: process.env.DISABLE_THREADING,
     DISABLE_DEVELOPER_LICENSE: process.env.DISABLE_DEVELOPER_LICENSE,
-    DISABLE_AUTOMATION_LOGS: process.env.DISABLE_AUTOMATION_LOGS,
     MULTI_TENANCY: process.env.MULTI_TENANCY,
     ENABLE_ANALYTICS: process.env.ENABLE_ANALYTICS,
     SELF_HOSTED: process.env.SELF_HOSTED,

package/dist/integrations/airtable.js

@@ -17,7 +17,6 @@ var AirtableModule;
         docs: "https://airtable.com/api",
         description: "Airtable is a spreadsheet-database hybrid, with the features of a database but applied to a spreadsheet.",
         friendlyName: "Airtable",
-        type: "Spreadsheet",
         datasource: {
             apiKey: {
                 type: datasource_1.DatasourceFieldTypes.PASSWORD,

package/dist/integrations/arangodb.js

@@ -16,7 +16,6 @@ var ArangoModule;
     const SCHEMA = {
         docs: "https://github.com/arangodb/arangojs",
         friendlyName: "ArangoDB",
-        type: "Non-relational",
         description: "ArangoDB is a scalable open-source multi-model database natively supporting graph, document and search. All supported data models & access patterns can be combined in queries allowing for maximal flexibility. ",
         datasource: {
             url: {

package/dist/integrations/base/sql.js

@@ -89,23 +89,6 @@ function parseFilters(filters) {
     }
     return filters;
 }
-function generateSelectStatement(json, knex) {
-    var _a;
-    const { resource, meta } = json;
-    const schema = (_a = meta === null || meta === void 0 ? void 0 : meta.table) === null || _a === void 0 ? void 0 : _a.schema;
-    return resource.fields.map(field => {
-        const fieldNames = field.split(/\./g);
-        const tableName = fieldNames[0];
-        const columnName = fieldNames[1];
-        if (columnName && knex.client.config.client === utils_1.SqlClients.POSTGRES) {
-            const externalType = schema === null || schema === void 0 ? void 0 : schema[columnName].externalType;
-            if (externalType === null || externalType === void 0 ? void 0 : externalType.includes("money")) {
-                return knex.raw(`"${tableName}"."${columnName}"::money::numeric as "${field}"`);
-            }
-        }
-        return `${field} as ${field}`;
-    });
-}
 class InternalBuilder {
     constructor(client) {
         this.client = client;
@@ -226,7 +209,7 @@ class InternalBuilder {
         }
         return query;
     }
-    addRelationships(query, fromTable, relationships) {
+    addRelationships(knex, query, fields, fromTable, relationships) {
         if (!relationships) {
             return query;
         }
@@ -328,7 +311,7 @@ class InternalBuilder {
         if (resource.fields && resource.fields.length > 0) {
             // select the resources as the format "table.columnName" - this is what is provided
             // by the resource builder further up
-            selectStatement = generateSelectStatement(json, knex);
+            selectStatement = resource.fields.map(field => `${field} as ${field}`);
         }
         let foundLimit = limit || BASE_LIMIT;
         // handle pagination
@@ -364,7 +347,7 @@ class InternalBuilder {
             preQuery = this.addSorting(preQuery, json);
         }
         // handle joins
-        query = this.addRelationships(preQuery, tableName, relationships);
+        query = this.addRelationships(knex, preQuery, selectStatement, tableName, relationships);
         return this.addFilters(query, filters, { relationship: true });
     }
     update(knex, json, opts) {

package/dist/integrations/couchdb.js

@@ -16,7 +16,6 @@ var CouchDBModule;
     const SCHEMA = {
         docs: "https://docs.couchdb.org/en/stable/",
         friendlyName: "CouchDB",
-        type: "Non-relational",
         description: "Apache CouchDB is an open-source document-oriented NoSQL database, implemented in Erlang.",
         datasource: {
             url: {

package/dist/integrations/dynamodb.js

@@ -18,7 +18,6 @@ var DynamoModule;
         docs: "https://github.com/dabit3/dynamodb-documentclient-cheat-sheet",
         description: "Amazon DynamoDB is a key-value and document database that delivers single-digit millisecond performance at any scale.",
         friendlyName: "DynamoDB",
-        type: "Non-relational",
         datasource: {
             region: {
                 type: datasource_1.DatasourceFieldTypes.STRING,

package/dist/integrations/elasticsearch.js

@@ -17,7 +17,6 @@ var ElasticsearchModule;
         docs: "https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/index.html",
         description: "Elasticsearch is a search engine based on the Lucene library. It provides a distributed, multitenant-capable full-text search engine with an HTTP web interface and schema-free JSON documents.",
         friendlyName: "ElasticSearch",
-        type: "Non-relational",
         datasource: {
             url: {
                 type: datasource_1.DatasourceFieldTypes.STRING,

package/dist/integrations/firebase.js

@@ -16,7 +16,6 @@ var Firebase;
     const SCHEMA = {
         docs: "https://firebase.google.com/docs/firestore/quickstart",
         friendlyName: "Firestore",
-        type: "Non-relational",
         description: "Cloud Firestore is a flexible, scalable database for mobile, web, and server development from Firebase and Google Cloud.",
         datasource: {
             email: {