@budibase/server 1.0.43 → 1.0.44-alpha.0

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

@@ -12,7 +12,7 @@ const CouchDB = require("../../../db");
 const internal = require("./internal");
 const external = require("./external");
 const csvParser = require("../../../utilities/csvParser");
-const { isExternalTable } = require("../../../integrations/utils");
+const { isExternalTable, isSQL } = require("../../../integrations/utils");
 const { getTableParams, getDatasourceParams, BudibaseInternalDB, } = require("../../../db/utils");
 const { getTable } = require("./utils");
 function pickApi({ tableId, table }) {
@@ -34,12 +34,18 @@ exports.fetch = function (ctx) {
         const internalTables = yield db.allDocs(getTableParams(null, {
             include_docs: true,
         }));
-        const internal = internalTables.rows.map(row => (Object.assign(Object.assign({}, row.doc), { type: "internal", sourceId: BudibaseInternalDB._id })));
+        const internal = internalTables.rows.map(tableDoc => (Object.assign(Object.assign({}, tableDoc.doc), { type: "internal", sourceId: BudibaseInternalDB._id })));
         const externalTables = yield db.allDocs(getDatasourceParams("plus", {
             include_docs: true,
         }));
-        const external = externalTables.rows.flatMap(row => {
-            return Object.values(row.doc.entities || {}).map(entity => (Object.assign(Object.assign({}, entity), { type: "external", sourceId: row.doc._id })));
+        const external = externalTables.rows.flatMap(tableDoc => {
+            let entities = tableDoc.doc.entities;
+            if (entities) {
+                return Object.values(entities).map(entity => (Object.assign(Object.assign({}, entity), { type: "external", sourceId: tableDoc.doc._id, sql: isSQL(tableDoc.doc) })));
+            }
+            else {
+                return [];
+            }
         });
         ctx.body = [...internal, ...external];
     });

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

@@ -15,7 +15,7 @@ const { isEqual } = require("lodash/fp");
 const { AutoFieldSubTypes, FieldTypes } = require("../../../constants");
 const { inputProcessing } = require("../../../utilities/rowProcessor");
 const { USERS_TABLE_SCHEMA, SwitchableTypes } = require("../../../constants");
-const { isExternalTable, breakExternalTableId, } = require("../../../integrations/utils");
+const { isExternalTable, breakExternalTableId, isSQL, } = require("../../../integrations/utils");
 const { getViews, saveView } = require("../view/utils");
 const viewTemplate = require("../view/viewBuilder");
 exports.checkForColumnUpdates = (db, oldTable, updatedTable) => __awaiter(void 0, void 0, void 0, function* () {
@@ -207,7 +207,9 @@ exports.getTable = (appId, tableId) => __awaiter(void 0, void 0, void 0, functio
     const db = new CouchDB(appId);
     if (isExternalTable(tableId)) {
         let { datasourceId, tableName } = breakExternalTableId(tableId);
-        return exports.getExternalTable(appId, datasourceId, tableName);
+        const datasource = yield db.get(datasourceId);
+        const table = yield exports.getExternalTable(appId, datasourceId, tableName);
+        return Object.assign(Object.assign({}, table), { sql: isSQL(datasource) });
     }
     else {
         return db.get(tableId);

package/dist/integrations/base/sql.js

@@ -69,10 +69,16 @@ class InternalBuilder {
         this.client = client;
     }
     // right now we only do filters on the specific table being queried
-    addFilters(tableName, query, filters) {
+    addFilters(query, filters, opts) {
         function iterate(structure, fn) {
             for (let [key, value] of Object.entries(structure)) {
-                fn(`${tableName}.${key}`, value);
+                const isRelationshipField = key.includes(".");
+                if (!opts.relationship && !isRelationshipField) {
+                    fn(`${opts.tableName}.${key}`, value);
+                }
+                if (opts.relationship && isRelationshipField) {
+                    fn(key, value);
+                }
             }
         }
         if (!filters) {
@@ -248,7 +254,7 @@ class InternalBuilder {
         if (foundOffset) {
             query = query.offset(foundOffset);
         }
-        query = this.addFilters(tableName, query, filters);
+        query = this.addFilters(query, filters, { tableName });
         // add sorting to pre-query
         query = this.addSorting(query, json);
         // @ts-ignore
@@ -261,13 +267,14 @@ class InternalBuilder {
             preQuery = this.addSorting(preQuery, json);
         }
         // handle joins
-        return this.addRelationships(knex, preQuery, selectStatement, tableName, relationships);
+        query = this.addRelationships(knex, preQuery, selectStatement, tableName, relationships);
+        return this.addFilters(query, filters, { relationship: true });
     }
     update(knex, json, opts) {
         const { endpoint, body, filters } = json;
         let query = knex(endpoint.entityId);
         const parsedBody = parseBody(body);
-        query = this.addFilters(endpoint.entityId, query, filters);
+        query = this.addFilters(query, filters, { tableName: endpoint.entityId });
         // mysql can't use returning
         if (opts.disableReturning) {
             return query.update(parsedBody);
@@ -279,7 +286,7 @@ class InternalBuilder {
     delete(knex, json, opts) {
         const { endpoint, filters } = json;
         let query = knex(endpoint.entityId);
-        query = this.addFilters(endpoint.entityId, query, filters);
+        query = this.addFilters(query, filters, { tableName: endpoint.entityId });
         // mysql can't use returning
         if (opts.disableReturning) {
             return query.delete();

package/dist/integrations/utils.js

@@ -125,7 +125,12 @@ function isSQL(datasource) {
     if (!datasource || !datasource.source) {
         return false;
     }
-    const SQL = [datasource_1.SourceNames.POSTGRES, datasource_1.SourceNames.SQL_SERVER, datasource_1.SourceNames.MYSQL];
+    const SQL = [
+        datasource_1.SourceNames.POSTGRES,
+        datasource_1.SourceNames.SQL_SERVER,
+        datasource_1.SourceNames.MYSQL,
+        datasource_1.SourceNames.ORACLE,
+    ];
     return SQL.indexOf(datasource.source) !== -1;
 }
 exports.isSQL = isSQL;

package/dist/middleware/currentapp.js

@@ -49,6 +49,15 @@ module.exports = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
         !isWebhookEndpoint(ctx) &&
         (!ctx.user || !ctx.user.builder || !ctx.user.builder.global)) {
         clearCookie(ctx, Cookies.CurrentApp);
+        // have to set the return url on the server side as client side is not available
+        setCookie(ctx, ctx.url, Cookies.RETURN_URL, {
+            // don't sign so the browser can easily read
+            sign: false,
+            // use the request domain to match how ui handles the return url cookie.
+            // it's important we don't use the shared domain here as the builder
+            // can't delete from it without awareness of the domain.
+            requestDomain: true,
+        });
         return ctx.redirect("/");
     }
     let appId, roleId = BUILTIN_ROLE_IDS.PUBLIC;

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.42",
+    "version": "1.0.43",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -70,9 +70,9 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "^10.0.3",
-        "@budibase/backend-core": "^1.0.42",
-        "@budibase/client": "^1.0.42",
-        "@budibase/string-templates": "^1.0.42",
+        "@budibase/backend-core": "^1.0.43",
+        "@budibase/client": "^1.0.43",
+        "@budibase/string-templates": "^1.0.43",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",