@budibase/server 1.0.149 → 1.0.151-alpha.1

package/coverage/lcov-report/utilities/usageQuota/usageQuoteReset.js.html

@@ -124,7 +124,7 @@ function <span class="fstat-no" title="function not covered" >resetQuotasIfRequi
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Mon May 09 2022 14:53:52 GMT+0000 (Coordinated Universal Time)
+                at Wed May 11 2022 11:09:35 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/users.js.html

@@ -142,7 +142,7 @@ exports.getFullUser = async (ctx, userId) => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Mon May 09 2022 14:53:52 GMT+0000 (Coordinated Universal Time)
+                at Wed May 11 2022 11:09:35 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/workerRequests.js.html

@@ -487,7 +487,7 @@ exports.readGlobalUser = <span class="fstat-no" title="function not covered" >as
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Mon May 09 2022 14:53:52 GMT+0000 (Coordinated Universal Time)
+                at Wed May 11 2022 11:09:35 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov.info

@@ -4752,8 +4752,8 @@ BRH:12
 end_of_record
 TN:
 SF:src/automations/steps/queryRows.js
-FN:74,getTable
-FN:84,(anonymous_1)
+FN:75,getTable
+FN:85,(anonymous_1)
 FNF:2
 FNH:2
 FNDA:1,getTable
@@ -4766,35 +4766,35 @@ DA:5,41
 DA:7,41
 DA:12,41
 DA:17,41
-DA:75,1
-DA:80,1
+DA:76,1
 DA:81,1
-DA:84,41
-DA:85,1
+DA:82,1
+DA:85,41
 DA:86,1
 DA:87,1
 DA:88,1
 DA:89,1
 DA:90,1
-DA:93,1
-DA:105,1
+DA:91,1
+DA:94,1
 DA:106,1
 DA:107,1
-DA:112,0
+DA:108,1
+DA:113,0
 LF:23
 LH:22
-BRDA:88,0,0,1
-BRDA:88,0,1,0
-BRDA:88,1,0,1
-BRDA:88,1,1,1
-BRDA:88,1,2,1
-BRDA:88,1,3,1
-BRDA:91,2,0,0
-BRDA:91,2,1,1
-BRDA:101,3,0,1
-BRDA:101,3,1,0
-BRDA:108,4,0,1
-BRDA:108,4,1,0
+BRDA:89,0,0,1
+BRDA:89,0,1,0
+BRDA:89,1,0,1
+BRDA:89,1,1,1
+BRDA:89,1,2,1
+BRDA:89,1,3,1
+BRDA:92,2,0,0
+BRDA:92,2,1,1
+BRDA:102,3,0,1
+BRDA:102,3,1,0
+BRDA:109,4,0,1
+BRDA:109,4,1,0
 BRF:12
 BRH:8
 end_of_record

package/dist/automations/steps/queryRows.js

@@ -57,6 +57,7 @@ exports.definition = {
                 limit: {
                     type: "number",
                     title: "Limit",
+                    customType: "queryLimit",
                 },
             },
             required: ["tableId"],

package/dist/integrations/postgres.js

@@ -115,7 +115,7 @@ var PostgresModule;
         getStringConcat(parts) {
             return parts.join(" || ");
         }
-        internalQuery(query) {
+        internalQuery(query, close = true) {
             return __awaiter(this, void 0, void 0, function* () {
                 const client = this.client;
                 this.index = 1;
@@ -134,11 +134,13 @@ var PostgresModule;
                     return yield client.query(query.sql, query.bindings || []);
                 }
                 catch (err) {
+                    yield this.client.end();
                     // @ts-ignore
                     throw new Error(err);
                 }
                 finally {
-                    yield this.client.end();
+                    if (close)
+                        yield this.client.end();
                 }
             });
         }
@@ -177,35 +179,41 @@ var PostgresModule;
                 catch (err) {
                     tableKeys = {};
                 }
-                finally {
-                    yield this.client.close();
-                }
-                const columnsResponse = yield this.client.query(this.COLUMNS_SQL);
-                const tables = {};
-                for (let column of columnsResponse.rows) {
-                    const tableName = column.table_name;
-                    const columnName = column.column_name;
-                    // table key doesn't exist yet
-                    if (!tables[tableName] || !tables[tableName].schema) {
-                        tables[tableName] = {
-                            _id: (0, utils_1.buildExternalTableId)(datasourceId, tableName),
-                            primary: tableKeys[tableName] || [],
-                            name: tableName,
-                            schema: {},
-                        };
+                try {
+                    const columnsResponse = yield this.client.query(this.COLUMNS_SQL);
+                    const tables = {};
+                    for (let column of columnsResponse.rows) {
+                        const tableName = column.table_name;
+                        const columnName = column.column_name;
+                        // table key doesn't exist yet
+                        if (!tables[tableName] || !tables[tableName].schema) {
+                            tables[tableName] = {
+                                _id: (0, utils_1.buildExternalTableId)(datasourceId, tableName),
+                                primary: tableKeys[tableName] || [],
+                                name: tableName,
+                                schema: {},
+                            };
+                        }
+                        const identity = !!(column.identity_generation ||
+                            column.identity_start ||
+                            column.identity_increment);
+                        const hasDefault = typeof column.column_default === "string" &&
+                            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({ autocolumn: isAuto, name: columnName }, (0, utils_1.convertSqlType)(column.data_type));
                     }
-                    const identity = !!(column.identity_generation ||
-                        column.identity_start ||
-                        column.identity_increment);
-                    const hasDefault = typeof column.column_default === "string" &&
-                        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({ autocolumn: isAuto, name: columnName }, (0, utils_1.convertSqlType)(column.data_type));
+                    const final = (0, utils_1.finaliseExternalTables)(tables, entities);
+                    this.tables = final.tables;
+                    this.schemaErrors = final.errors;
+                }
+                catch (err) {
+                    // @ts-ignore
+                    throw new Error(err);
+                }
+                finally {
+                    yield this.client.end();
                 }
-                const final = (0, utils_1.finaliseExternalTables)(tables, entities);
-                this.tables = final.tables;
-                this.schemaErrors = final.errors;
             });
         }
         create(query) {
@@ -239,8 +247,9 @@ var PostgresModule;
                 if (Array.isArray(input)) {
                     const responses = [];
                     for (let query of input) {
-                        responses.push(yield this.internalQuery(query));
+                        responses.push(yield this.internalQuery(query, false));
                     }
+                    yield this.client.end();
                     return responses;
                 }
                 else {

package/dist/package.json

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