@budibase/server 1.0.149 → 1.0.150

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.149",
     "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.149",
+        "@budibase/client": "^1.0.149",
+        "@budibase/pro": "1.0.149",
+        "@budibase/string-templates": "^1.0.149",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",