@budibase/server 1.0.207-alpha.9 → 1.0.209

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/index.js

@@ -13,7 +13,6 @@ const rest = require("./rest");
 const googlesheets = require("./googlesheets");
 const firebase = require("./firebase");
 const redis = require("./redis");
-const snowflake = require("./snowflake");
 const { SourceNames } = require("../definitions/datasource");
 const environment = require("../environment");
 const DEFINITIONS = {
@@ -30,7 +29,6 @@ const DEFINITIONS = {
     [SourceNames.REST]: rest.schema,
     [SourceNames.FIRESTORE]: firebase.schema,
     [SourceNames.REDIS]: redis.schema,
-    [SourceNames.SNOWFLAKE]: snowflake.schema,
 };
 const INTEGRATIONS = {
     [SourceNames.POSTGRES]: postgres.integration,
@@ -47,8 +45,6 @@ const INTEGRATIONS = {
     [SourceNames.FIRESTORE]: firebase.integration,
     [SourceNames.GOOGLE_SHEETS]: googlesheets.integration,
     [SourceNames.REDIS]: redis.integration,
-    [SourceNames.FIREBASE]: firebase.integration,
-    [SourceNames.SNOWFLAKE]: snowflake.integration,
 };
 // optionally add oracle integration if the oracle binary can be installed
 if (!(process.arch === "arm64" && process.platform === "darwin")) {

package/dist/integrations/microsoftSqlServer.js

@@ -201,7 +201,7 @@ var MSSQLModule;
                         if (typeof name !== "string") {
                             continue;
                         }
-                        schema[name] = Object.assign(Object.assign({ autocolumn: !!autoColumns.find((col) => col === name), name: name }, (0, utils_1.convertSqlType)(def.DATA_TYPE)), { externalType: def.DATA_TYPE });
+                        schema[name] = Object.assign({ autocolumn: !!autoColumns.find((col) => col === name), name: name }, (0, utils_1.convertSqlType)(def.DATA_TYPE));
                     }
                     tables[tableName] = {
                         _id: (0, utils_1.buildExternalTableId)(datasourceId, tableName),

package/dist/integrations/mongodb.js

@@ -224,6 +224,12 @@ var MongoDBModule;
                         queryJson = this.parseQueryParams(queryJson, "delete");
                     }
                     let json = this.createObjectIds(queryJson);
+                    if (!json.options) {
+                        json = {
+                            filter: json,
+                            options: {},
+                        };
+                    }
                     switch (query.extra.actionTypes) {
                         case "deleteOne": {
                             return yield collection.deleteOne(json.filter, json.options);

package/dist/integrations/mysql.js

@@ -187,7 +187,7 @@ var MySQLModule;
                             const isAuto = typeof column.Extra === "string" &&
                                 (column.Extra === "auto_increment" ||
                                     column.Extra.toLowerCase().includes("generated"));
-                            schema[columnName] = Object.assign(Object.assign({ name: columnName, autocolumn: isAuto, constraints }, (0, utils_1.convertSqlType)(column.Type)), { externalType: column.Type });
+                            schema[columnName] = Object.assign({ name: columnName, autocolumn: isAuto, constraints }, (0, utils_1.convertSqlType)(column.Type));
                         }
                         if (!tables[tableName]) {
                             tables[tableName] = {

package/dist/integrations/postgres.js

@@ -229,7 +229,7 @@ var PostgresModule;
                             column.column_default.startsWith("nextval");
                         const isGenerated = column.is_generated && column.is_generated !== "NEVER";
                         const isAuto = hasDefault || identity || isGenerated;
-                        tables[tableName].schema[columnName] = Object.assign(Object.assign({ autocolumn: isAuto, name: columnName }, (0, utils_1.convertSqlType)(column.data_type)), { externalType: column.data_type });
+                        tables[tableName].schema[columnName] = Object.assign({ autocolumn: isAuto, name: columnName }, (0, utils_1.convertSqlType)(column.data_type));
                     }
                     const final = (0, utils_1.finaliseExternalTables)(tables, entities);
                     this.tables = final.tables;

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.207-alpha.8",
+    "version": "1.0.208",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -77,11 +77,10 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "10.0.3",
-        "@budibase/backend-core": "^1.0.207-alpha.8",
-        "@budibase/client": "^1.0.207-alpha.8",
-        "@budibase/pro": "1.0.207-alpha.8",
-        "@budibase/string-templates": "^1.0.207-alpha.8",
-        "@budibase/types": "^1.0.207-alpha.8",
+        "@budibase/backend-core": "^1.0.208",
+        "@budibase/client": "^1.0.208",
+        "@budibase/pro": "1.0.208",
+        "@budibase/string-templates": "^1.0.208",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",
@@ -136,7 +135,6 @@
         "pouchdb-replication-stream": "1.2.9",
         "redis": "4",
         "server-destroy": "1.0.1",
-        "snowflake-promise": "^4.5.0",
         "svelte": "3.44.1",
         "swagger-parser": "10.0.3",
         "to-json-schema": "0.2.5",
@@ -152,7 +150,7 @@
         "@babel/core": "7.17.4",
         "@babel/preset-env": "7.16.11",
         "@budibase/standard-components": "^0.9.139",
-        "@budibase/types": "^1.0.207-alpha.3",
+        "@budibase/types": "^1.0.208",
         "@jest/test-sequencer": "24.9.0",
         "@types/apidoc": "0.50.0",
         "@types/bson": "4.2.0",