@budibase/server 1.0.169 → 1.0.170

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

@@ -211,32 +211,32 @@
 <span class="cline-any cline-yes">41x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">11x</span>
-<span class="cline-any cline-yes">11x</span>
+<span class="cline-any cline-yes">12x</span>
+<span class="cline-any cline-yes">12x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">11x</span>
+<span class="cline-any cline-yes">12x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">11x</span>
+<span class="cline-any cline-yes">12x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">11x</span>
+<span class="cline-any cline-yes">12x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">11x</span>
+<span class="cline-any cline-yes">12x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">11x</span>
+<span class="cline-any cline-yes">12x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">11x</span>
+<span class="cline-any cline-yes">12x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -252,7 +252,7 @@
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">11x</span>
+<span class="cline-any cline-yes">12x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">41x</span>
@@ -292,14 +292,14 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">41x</span>
-<span class="cline-any cline-yes">11x</span>
-<span class="cline-any cline-yes">11x</span>
+<span class="cline-any cline-yes">12x</span>
+<span class="cline-any cline-yes">12x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">11x</span>
+<span class="cline-any cline-yes">12x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">41x</span>
@@ -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 23 2022 00:06:12 GMT+0000 (Coordinated Universal Time)
+                at Mon May 23 2022 07:51:03 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov.info

@@ -5234,10 +5234,10 @@ FN:368,(anonymous_29)
 FNF:30
 FNH:25
 FNDA:74,(anonymous_0)
-FNDA:908,getDocParams
+FNDA:909,getDocParams
 FNDA:220,(anonymous_2)
 FNDA:105,(anonymous_3)
-FNDA:27,(anonymous_4)
+FNDA:28,(anonymous_4)
 FNDA:0,(anonymous_5)
 FNDA:264,(anonymous_6)
 FNDA:3,(anonymous_7)
@@ -5293,17 +5293,17 @@ DA:88,54
 DA:89,54
 DA:91,54
 DA:92,74
-DA:108,908
-DA:109,893
-DA:111,908
+DA:108,909
+DA:109,894
+DA:111,909
 DA:118,54
 DA:123,54
 DA:124,220
 DA:131,54
 DA:132,105
 DA:143,54
-DA:144,27
-DA:145,15
+DA:144,28
+DA:145,16
 DA:148,12
 DA:150,12
 DA:158,54
@@ -5373,14 +5373,14 @@ LF:106
 LH:97
 BRDA:107,0,0,0
 BRDA:107,1,0,0
-BRDA:108,2,0,893
+BRDA:108,2,0,894
 BRDA:108,2,1,15
 BRDA:123,3,0,0
 BRDA:123,4,0,0
 BRDA:143,5,0,0
 BRDA:143,6,0,0
 BRDA:143,7,0,0
-BRDA:144,8,0,15
+BRDA:144,8,0,16
 BRDA:144,8,1,12
 BRDA:148,9,0,12
 BRDA:148,9,1,0
@@ -7401,7 +7401,7 @@ FNH:13
 FNDA:4,(anonymous_0)
 FNDA:4,(anonymous_1)
 FNDA:1,(anonymous_2)
-FNDA:34,(anonymous_3)
+FNDA:35,(anonymous_3)
 FNDA:2,(anonymous_4)
 FNDA:211,(anonymous_5)
 FNDA:2,(anonymous_6)
@@ -7430,7 +7430,7 @@ DA:18,1
 DA:19,1
 DA:21,1
 DA:30,44
-DA:31,34
+DA:31,35
 DA:38,44
 DA:39,2
 DA:41,2
@@ -7679,11 +7679,11 @@ FN:119,(anonymous_7)
 FN:130,(anonymous_8)
 FNF:9
 FNH:3
-FNDA:11,request
-FNDA:11,checkResponse
+FNDA:12,request
+FNDA:12,checkResponse
 FNDA:0,(anonymous_2)
 FNDA:0,(anonymous_3)
-FNDA:11,(anonymous_4)
+FNDA:12,(anonymous_4)
 FNDA:0,(anonymous_5)
 FNDA:0,(anonymous_6)
 FNDA:0,(anonymous_7)
@@ -7695,20 +7695,20 @@ DA:4,41
 DA:5,41
 DA:6,41
 DA:7,41
-DA:10,11
-DA:11,11
-DA:13,11
+DA:10,12
+DA:11,12
+DA:13,12
 DA:14,0
 DA:15,0
 DA:16,0
-DA:19,11
+DA:19,12
 DA:20,0
 DA:21,0
-DA:26,11
-DA:28,11
+DA:26,12
+DA:28,12
 DA:29,1
-DA:31,11
-DA:35,11
+DA:31,12
+DA:35,12
 DA:37,0
 DA:38,0
 DA:40,0
@@ -7716,7 +7716,7 @@ DA:42,0
 DA:45,0
 DA:46,0
 DA:48,0
-DA:51,11
+DA:51,12
 DA:54,41
 DA:57,41
 DA:59,0
@@ -7729,9 +7729,9 @@ DA:84,0
 DA:85,0
 DA:87,0
 DA:90,41
-DA:91,11
-DA:92,11
-DA:98,11
+DA:91,12
+DA:92,12
+DA:98,12
 DA:101,41
 DA:102,0
 DA:107,0
@@ -7746,25 +7746,25 @@ DA:131,0
 DA:138,0
 LF:56
 LH:28
-BRDA:10,0,0,11
+BRDA:10,0,0,12
 BRDA:10,0,1,0
 BRDA:13,1,0,0
-BRDA:13,1,1,11
+BRDA:13,1,1,12
 BRDA:15,2,0,0
 BRDA:15,2,1,0
 BRDA:19,3,0,0
-BRDA:19,3,1,11
-BRDA:19,4,0,11
+BRDA:19,3,1,12
+BRDA:19,4,0,12
 BRDA:19,4,1,0
 BRDA:22,5,0,0
 BRDA:22,5,1,0
 BRDA:28,6,0,1
-BRDA:28,6,1,10
-BRDA:28,7,0,11
-BRDA:28,7,1,11
-BRDA:34,8,0,11
+BRDA:28,6,1,11
+BRDA:28,7,0,12
+BRDA:28,7,1,12
+BRDA:34,8,0,12
 BRDA:35,9,0,0
-BRDA:35,9,1,11
+BRDA:35,9,1,12
 BRDA:43,10,0,0
 BRDA:43,10,1,0
 BRDA:45,11,0,0
@@ -8219,57 +8219,57 @@ FN:38,(anonymous_4)
 FN:54,(anonymous_5)
 FNF:6
 FNH:6
-FNDA:35,(anonymous_0)
-FNDA:15,(anonymous_1)
-FNDA:15,(anonymous_2)
+FNDA:36,(anonymous_0)
+FNDA:16,(anonymous_1)
+FNDA:16,(anonymous_2)
 FNDA:3,(anonymous_3)
 FNDA:3,(anonymous_4)
-FNDA:35,(anonymous_5)
+FNDA:36,(anonymous_5)
 DA:1,40
 DA:6,40
 DA:8,40
 DA:10,40
-DA:13,35
-DA:14,35
-DA:15,15
-DA:16,15
-DA:17,13
-DA:19,15
-DA:20,13
+DA:13,36
+DA:14,36
+DA:15,16
+DA:16,16
+DA:17,14
+DA:19,16
+DA:20,14
 DA:22,2
-DA:25,35
+DA:25,36
 DA:28,40
-DA:30,15
-DA:31,15
-DA:36,15
+DA:30,16
+DA:31,16
+DA:36,16
 DA:37,3
 DA:39,3
 DA:40,3
 DA:41,0
 DA:44,3
 DA:54,40
-DA:55,35
-DA:56,35
-DA:58,35
-DA:59,13
-DA:60,13
-DA:61,26
-DA:62,11
-DA:64,15
-DA:65,15
+DA:55,36
+DA:56,36
+DA:58,36
+DA:59,14
+DA:60,14
+DA:61,28
+DA:62,12
+DA:64,16
+DA:65,16
 DA:67,0
-DA:75,13
-DA:78,35
+DA:75,14
+DA:78,36
 LF:35
 LH:33
-BRDA:16,0,0,13
+BRDA:16,0,0,14
 BRDA:16,0,1,2
-BRDA:19,1,0,13
+BRDA:19,1,0,14
 BRDA:19,1,1,2
 BRDA:40,2,0,0
 BRDA:40,2,1,3
-BRDA:61,3,0,11
-BRDA:61,3,1,15
+BRDA:61,3,0,12
+BRDA:61,3,1,16
 BRF:8
 BRH:7
 end_of_record

package/dist/integrations/postgres.js

@@ -107,7 +107,7 @@ var PostgresModule;
                     }
                     : undefined });
             this.client = new Client(newConfig);
-            this.setSchema();
+            this.open = false;
         }
         getBindingIdentifier() {
             return `$${this.index++}`;
@@ -115,8 +115,36 @@ var PostgresModule;
         getStringConcat(parts) {
             return parts.join(" || ");
         }
+        openConnection() {
+            return __awaiter(this, void 0, void 0, function* () {
+                yield this.client.connect();
+                if (!this.config.schema) {
+                    this.config.schema = "public";
+                }
+                this.client.query(`SET search_path TO ${this.config.schema}`);
+                this.COLUMNS_SQL = `select * from information_schema.columns where table_schema = '${this.config.schema}'`;
+                this.open = true;
+            });
+        }
+        closeConnection() {
+            const pg = this;
+            return new Promise((resolve, reject) => {
+                this.client.end((err) => {
+                    pg.open = false;
+                    if (err) {
+                        reject(err);
+                    }
+                    else {
+                        resolve();
+                    }
+                });
+            });
+        }
         internalQuery(query, close = true) {
             return __awaiter(this, void 0, void 0, function* () {
+                if (!this.open) {
+                    yield this.openConnection();
+                }
                 const client = this.client;
                 this.index = 1;
                 // need to handle a specific issue with json data types in postgres,
@@ -134,24 +162,15 @@ var PostgresModule;
                     return yield client.query(query.sql, query.bindings || []);
                 }
                 catch (err) {
-                    yield this.client.end();
+                    yield this.closeConnection();
                     // @ts-ignore
                     throw new Error(err);
                 }
                 finally {
-                    if (close)
-                        yield this.client.end();
-                }
-            });
-        }
-        setSchema() {
-            return __awaiter(this, void 0, void 0, function* () {
-                yield this.client.connect();
-                if (!this.config.schema) {
-                    this.config.schema = "public";
+                    if (close) {
+                        yield this.closeConnection();
+                    }
                 }
-                this.client.query(`SET search_path TO ${this.config.schema}`);
-                this.COLUMNS_SQL = `select * from information_schema.columns where table_schema = '${this.config.schema}'`;
             });
         }
         /**
@@ -162,6 +181,7 @@ var PostgresModule;
         buildSchema(datasourceId, entities) {
             return __awaiter(this, void 0, void 0, function* () {
                 let tableKeys = {};
+                yield this.openConnection();
                 try {
                     const primaryKeysResponse = yield this.client.query(this.PRIMARY_KEYS_SQL);
                     for (let table of primaryKeysResponse.rows) {
@@ -212,7 +232,7 @@ var PostgresModule;
                     throw new Error(err);
                 }
                 finally {
-                    yield this.client.end();
+                    yield this.closeConnection();
                 }
             });
         }
@@ -249,7 +269,7 @@ var PostgresModule;
                     for (let query of input) {
                         responses.push(yield this.internalQuery(query, false));
                     }
-                    yield this.client.end();
+                    yield this.closeConnection();
                     return responses;
                 }
                 else {

package/dist/package.json

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