@budibase/server 1.0.80-alpha.2 → 1.0.80-alpha.5

package/coverage/lcov.info

@@ -3555,19 +3555,19 @@ end_of_record
 TN:
 SF:src/api/controllers/table/external.js
 FN:23,makeTableRequest
-FN:47,cleanupRelationships
-FN:56,(anonymous_2)
-FN:76,getDatasourceId
-FN:86,otherRelationshipType
-FN:95,generateManyLinkSchema
-FN:123,generateLinkSchema
-FN:134,generateRelatedSchema
-FN:157,isRelationshipSetup
-FN:161,(anonymous_9)
-FN:198,(anonymous_10)
-FN:256,(anonymous_11)
-FN:268,(anonymous_12)
-FN:290,(anonymous_13)
+FN:51,cleanupRelationships
+FN:60,(anonymous_2)
+FN:80,getDatasourceId
+FN:90,otherRelationshipType
+FN:99,generateManyLinkSchema
+FN:127,generateLinkSchema
+FN:138,generateRelatedSchema
+FN:161,isRelationshipSetup
+FN:165,(anonymous_9)
+FN:203,(anonymous_10)
+FN:268,(anonymous_11)
+FN:282,(anonymous_12)
+FN:304,(anonymous_13)
 FNF:14
 FNH:0
 FNDA:0,makeTableRequest
@@ -3592,211 +3592,218 @@ DA:18,40
 DA:19,40
 DA:20,40
 DA:21,40
-DA:30,0
-DA:41,0
+DA:31,0
 DA:42,0
-DA:44,0
+DA:43,0
+DA:45,0
+DA:46,0
 DA:48,0
-DA:50,0
-DA:51,0
+DA:52,0
+DA:54,0
 DA:55,0
-DA:56,0
-DA:58,0
 DA:59,0
 DA:60,0
 DA:62,0
-DA:65,0
+DA:63,0
+DA:64,0
+DA:66,0
 DA:69,0
-DA:77,0
-DA:78,0
-DA:80,0
+DA:73,0
 DA:81,0
-DA:83,0
+DA:82,0
+DA:84,0
+DA:85,0
 DA:87,0
-DA:88,0
-DA:90,0
-DA:96,0
-DA:97,0
-DA:98,0
+DA:91,0
+DA:92,0
+DA:94,0
 DA:100,0
-DA:116,0
-DA:117,0
-DA:118,0
-DA:119,0
+DA:101,0
+DA:102,0
+DA:104,0
 DA:120,0
+DA:121,0
+DA:122,0
+DA:123,0
 DA:124,0
-DA:125,0
-DA:127,0
 DA:128,0
 DA:129,0
-DA:130,0
 DA:131,0
-DA:136,0
-DA:138,0
-DA:139,0
+DA:132,0
+DA:133,0
+DA:134,0
+DA:135,0
 DA:140,0
-DA:145,0
-DA:146,0
-DA:147,0
+DA:142,0
+DA:143,0
+DA:144,0
 DA:149,0
-DA:152,0
+DA:150,0
+DA:151,0
 DA:153,0
-DA:154,0
+DA:156,0
+DA:157,0
 DA:158,0
-DA:161,40
 DA:162,0
-DA:164,0
-DA:165,0
+DA:165,40
+DA:166,0
 DA:167,0
-DA:168,0
+DA:169,0
 DA:170,0
-DA:177,0
-DA:178,0
-DA:181,0
+DA:172,0
+DA:173,0
+DA:175,0
 DA:182,0
-DA:185,0
+DA:183,0
 DA:186,0
 DA:187,0
-DA:188,0
 DA:190,0
+DA:191,0
+DA:192,0
 DA:193,0
-DA:194,0
 DA:195,0
-DA:197,0
 DA:198,0
+DA:199,0
 DA:200,0
-DA:201,0
 DA:202,0
 DA:203,0
-DA:209,0
-DA:210,0
-DA:212,0
-DA:213,0
-DA:216,0
+DA:205,0
+DA:206,0
+DA:207,0
+DA:208,0
+DA:214,0
+DA:215,0
 DA:217,0
-DA:223,0
-DA:224,0
-DA:225,0
-DA:227,0
+DA:218,0
+DA:221,0
+DA:222,0
 DA:228,0
-DA:231,0
+DA:229,0
+DA:230,0
 DA:232,0
-DA:235,0
+DA:233,0
 DA:236,0
-DA:239,0
+DA:237,0
+DA:240,0
 DA:241,0
 DA:244,0
 DA:246,0
-DA:247,0
-DA:248,0
-DA:251,0
-DA:255,0
-DA:256,0
-DA:257,0
-DA:262,0
+DA:249,0
+DA:258,0
+DA:259,0
+DA:260,0
 DA:263,0
-DA:265,0
-DA:268,40
+DA:267,0
+DA:268,0
 DA:269,0
-DA:270,0
-DA:271,0
-DA:273,0
-DA:275,0
+DA:274,0
 DA:276,0
 DA:277,0
 DA:279,0
-DA:280,0
-DA:282,0
+DA:282,40
+DA:283,0
 DA:284,0
 DA:285,0
 DA:287,0
-DA:290,40
+DA:289,0
+DA:290,0
 DA:291,0
-DA:292,0
 DA:293,0
 DA:294,0
 DA:296,0
-DA:300,0
-DA:303,0
-LF:134
+DA:298,0
+DA:299,0
+DA:301,0
+DA:304,40
+DA:305,0
+DA:306,0
+DA:307,0
+DA:308,0
+DA:310,0
+DA:314,0
+DA:317,0
+LF:138
 LH:11
 BRDA:28,0,0,0
-BRDA:41,1,0,0
-BRDA:41,1,1,0
-BRDA:47,2,0,0
-BRDA:48,3,0,0
-BRDA:48,3,1,0
+BRDA:29,1,0,0
+BRDA:42,2,0,0
+BRDA:42,2,1,0
+BRDA:45,3,0,0
+BRDA:45,3,1,0
 BRDA:51,4,0,0
-BRDA:51,4,1,0
 BRDA:52,5,0,0
 BRDA:52,5,1,0
-BRDA:52,5,2,0
-BRDA:59,6,0,0
-BRDA:59,6,1,0
-BRDA:59,7,0,0
-BRDA:59,7,1,0
-BRDA:65,8,0,0
-BRDA:65,8,1,0
-BRDA:66,9,0,0
-BRDA:66,9,1,0
-BRDA:77,10,0,0
-BRDA:77,10,1,0
-BRDA:80,11,0,0
-BRDA:80,11,1,0
-BRDA:87,12,0,0
-BRDA:87,12,1,0
-BRDA:90,13,0,0
-BRDA:90,13,1,0
-BRDA:125,14,0,0
-BRDA:125,14,1,0
-BRDA:129,15,0,0
-BRDA:129,15,1,0
-BRDA:130,16,0,0
-BRDA:130,16,1,0
-BRDA:138,17,0,0
-BRDA:138,17,1,0
-BRDA:158,18,0,0
-BRDA:158,18,1,0
-BRDA:167,19,0,0
-BRDA:167,19,1,0
-BRDA:177,20,0,0
-BRDA:177,20,1,0
-BRDA:177,21,0,0
-BRDA:177,21,1,0
-BRDA:181,22,0,0
-BRDA:181,22,1,0
-BRDA:194,23,0,0
-BRDA:194,23,1,0
-BRDA:194,24,0,0
-BRDA:194,24,1,0
-BRDA:202,25,0,0
-BRDA:202,25,1,0
-BRDA:209,26,0,0
-BRDA:209,26,1,0
-BRDA:216,27,0,0
-BRDA:216,27,1,0
-BRDA:224,28,0,0
-BRDA:224,28,1,0
-BRDA:227,29,0,0
-BRDA:227,29,1,0
-BRDA:231,30,0,0
-BRDA:231,30,1,0
-BRDA:241,31,0,0
-BRDA:241,31,1,0
-BRDA:248,32,0,0
-BRDA:248,32,1,0
-BRDA:255,33,0,0
-BRDA:255,33,1,0
-BRDA:270,34,0,0
-BRDA:270,34,1,0
-BRDA:270,35,0,0
-BRDA:270,35,1,0
-BRDA:293,36,0,0
-BRDA:293,36,1,0
-BRDA:293,37,0,0
-BRDA:293,37,1,0
-BRDA:293,37,2,0
-BRF:76
+BRDA:55,6,0,0
+BRDA:55,6,1,0
+BRDA:56,7,0,0
+BRDA:56,7,1,0
+BRDA:56,7,2,0
+BRDA:63,8,0,0
+BRDA:63,8,1,0
+BRDA:63,9,0,0
+BRDA:63,9,1,0
+BRDA:69,10,0,0
+BRDA:69,10,1,0
+BRDA:70,11,0,0
+BRDA:70,11,1,0
+BRDA:81,12,0,0
+BRDA:81,12,1,0
+BRDA:84,13,0,0
+BRDA:84,13,1,0
+BRDA:91,14,0,0
+BRDA:91,14,1,0
+BRDA:94,15,0,0
+BRDA:94,15,1,0
+BRDA:129,16,0,0
+BRDA:129,16,1,0
+BRDA:133,17,0,0
+BRDA:133,17,1,0
+BRDA:134,18,0,0
+BRDA:134,18,1,0
+BRDA:142,19,0,0
+BRDA:142,19,1,0
+BRDA:162,20,0,0
+BRDA:162,20,1,0
+BRDA:172,21,0,0
+BRDA:172,21,1,0
+BRDA:182,22,0,0
+BRDA:182,22,1,0
+BRDA:182,23,0,0
+BRDA:182,23,1,0
+BRDA:186,24,0,0
+BRDA:186,24,1,0
+BRDA:199,25,0,0
+BRDA:199,25,1,0
+BRDA:199,26,0,0
+BRDA:199,26,1,0
+BRDA:207,27,0,0
+BRDA:207,27,1,0
+BRDA:214,28,0,0
+BRDA:214,28,1,0
+BRDA:221,29,0,0
+BRDA:221,29,1,0
+BRDA:229,30,0,0
+BRDA:229,30,1,0
+BRDA:232,31,0,0
+BRDA:232,31,1,0
+BRDA:236,32,0,0
+BRDA:236,32,1,0
+BRDA:246,33,0,0
+BRDA:246,33,1,0
+BRDA:260,34,0,0
+BRDA:260,34,1,0
+BRDA:267,35,0,0
+BRDA:267,35,1,0
+BRDA:284,36,0,0
+BRDA:284,36,1,0
+BRDA:284,37,0,0
+BRDA:284,37,1,0
+BRDA:307,38,0,0
+BRDA:307,38,1,0
+BRDA:307,39,0,0
+BRDA:307,39,1,0
+BRDA:307,39,2,0
+BRF:79
 BRH:0
 end_of_record
 TN:

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

@@ -16,7 +16,7 @@ const { cloneDeep } = require("lodash/fp");
 const csvParser = require("../../../utilities/csvParser");
 const { handleRequest } = require("../row/external");
 const { getAppDB } = require("@budibase/backend-core/context");
-function makeTableRequest(datasource, operation, table, tables, oldTable = null) {
+function makeTableRequest(datasource, operation, table, tables, oldTable = null, renamed = null) {
     return __awaiter(this, void 0, void 0, function* () {
         const json = {
             endpoint: {
@@ -32,6 +32,9 @@ function makeTableRequest(datasource, operation, table, tables, oldTable = null)
         if (oldTable) {
             json.meta.table = oldTable;
         }
+        if (renamed) {
+            json.meta.renamed = renamed;
+        }
         return makeExternalQuery(datasource, json);
     });
 }
@@ -135,6 +138,7 @@ function isRelationshipSetup(column) {
 exports.save = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const table = ctx.request.body;
+        const { _rename: renamed } = table;
         // can't do this right now
         delete table.dataImport;
         const datasourceId = getDatasourceId(ctx.request.body);
@@ -193,7 +197,7 @@ exports.save = function (ctx) {
         const operation = oldTable
             ? DataSourceOperation.UPDATE_TABLE
             : DataSourceOperation.CREATE_TABLE;
-        yield makeTableRequest(datasource, operation, tableToSave, tables, oldTable);
+        yield makeTableRequest(datasource, operation, tableToSave, tables, oldTable, renamed);
         // update any extra tables (like foreign keys in other tables)
         for (let extraTable of extraTablesToUpdate) {
             const oldExtraTable = oldTables[extraTable.name];
@@ -206,6 +210,8 @@ exports.save = function (ctx) {
         if (Array.isArray(tableToSave.constrained)) {
             tableToSave.constrained = tableToSave.constrained.filter(constraint => Object.keys(tableToSave.schema).includes(constraint));
         }
+        // remove the rename prop
+        delete tableToSave._rename;
         // store it into couch now for budibase reference
         datasource.entities[tableToSave.name] = tableToSave;
         yield db.put(datasource);

package/dist/integrations/base/sqlTable.js

@@ -4,7 +4,7 @@ const knex_1 = require("knex");
 const datasource_1 = require("../../definitions/datasource");
 const utils_1 = require("../utils");
 const { FieldTypes, RelationshipTypes } = require("../../constants");
-function generateSchema(schema, table, tables, oldTable = null) {
+function generateSchema(schema, table, tables, oldTable = null, renamed) {
     let primaryKey = table && table.primary ? table.primary[0] : null;
     const columns = Object.values(table.schema);
     // all columns in a junction table will be meta
@@ -22,7 +22,9 @@ function generateSchema(schema, table, tables, oldTable = null) {
     for (let [key, column] of Object.entries(table.schema)) {
         // skip things that are already correct
         const oldColumn = oldTable ? oldTable.schema[key] : null;
-        if ((oldColumn && oldColumn.type) || (primaryKey === key && !isJunction)) {
+        if ((oldColumn && oldColumn.type) ||
+            (primaryKey === key && !isJunction) ||
+            (renamed === null || renamed === void 0 ? void 0 : renamed.updated) === key) {
             continue;
         }
         switch (column.type) {
@@ -72,12 +74,18 @@ function generateSchema(schema, table, tables, oldTable = null) {
                 break;
         }
     }
+    if (renamed) {
+        schema.renameColumn(renamed.old, renamed.updated);
+    }
     // need to check if any columns have been deleted
     if (oldTable) {
         const deletedColumns = Object.entries(oldTable.schema)
             .filter(([key, schema]) => schema.type !== FieldTypes.LINK && table.schema[key] == null)
             .map(([key]) => key);
         deletedColumns.forEach(key => {
+            if ((renamed === null || renamed === void 0 ? void 0 : renamed.old) === key) {
+                return;
+            }
             if (oldTable.constrained && oldTable.constrained.indexOf(key) !== -1) {
                 schema.dropForeign(key);
             }
@@ -91,9 +99,9 @@ function buildCreateTable(knex, table, tables) {
         generateSchema(schema, table, tables);
     });
 }
-function buildUpdateTable(knex, table, tables, oldTable) {
+function buildUpdateTable(knex, table, tables, oldTable, renamed) {
     return knex.alterTable(table.name, schema => {
-        generateSchema(schema, table, tables, oldTable);
+        generateSchema(schema, table, tables, oldTable, renamed);
     });
 }
 function buildDeleteTable(knex, table) {
@@ -132,7 +140,7 @@ class SqlTableQueryBuilder {
                 if (!json.meta || !json.meta.table) {
                     throw "Must specify old table for update";
                 }
-                query = buildUpdateTable(client, json.table, json.meta.tables, json.meta.table);
+                query = buildUpdateTable(client, json.table, json.meta.tables, json.meta.table, json.meta.renamed);
                 break;
             case datasource_1.Operation.DELETE_TABLE:
                 query = buildDeleteTable(client, json.table);

package/dist/package.json

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