@budibase/server 1.0.143 → 1.0.146

package/coverage/lcov-report/utilities/rowProcessor/index.html

@@ -116,7 +116,7 @@
             <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 Thu May 05 2022 13:08:03 GMT+0000 (Coordinated Universal Time)
+                at Fri May 06 2022 15:36:48 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/rowProcessor/index.js.html

@@ -1096,7 +1096,7 @@ exports.cleanupAttachments = async (table, { row, rows, oldRow, oldTable }) =&gt
             <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 Thu May 05 2022 13:08:03 GMT+0000 (Coordinated Universal Time)
+                at Fri May 06 2022 15:36:48 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/rowProcessor/utils.js.html

@@ -271,7 +271,7 @@ exports.processFormulas = (
             <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 Thu May 05 2022 13:08:03 GMT+0000 (Coordinated Universal Time)
+                at Fri May 06 2022 15:36:48 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

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

@@ -142,7 +142,7 @@ module.exports = ScriptRunner
             <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 Thu May 05 2022 13:08:03 GMT+0000 (Coordinated Universal Time)
+                at Fri May 06 2022 15:36:48 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

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

@@ -280,7 +280,7 @@ exports.CURRENTLY_SUPPORTED_LEVELS = CURRENTLY_SUPPORTED_LEVELS
             <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 Thu May 05 2022 13:08:03 GMT+0000 (Coordinated Universal Time)
+                at Fri May 06 2022 15:36:48 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

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

@@ -91,7 +91,7 @@
             <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 Thu May 05 2022 13:08:03 GMT+0000 (Coordinated Universal Time)
+                at Fri May 06 2022 15:36:48 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/usageQuota/index.html

@@ -116,7 +116,7 @@
             <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 Thu May 05 2022 13:08:03 GMT+0000 (Coordinated Universal Time)
+                at Fri May 06 2022 15:36:48 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

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

@@ -307,7 +307,7 @@ exports.getUniqueRows = async appIds => {
             <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 Thu May 05 2022 13:08:03 GMT+0000 (Coordinated Universal Time)
+                at Fri May 06 2022 15:36:48 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

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 Thu May 05 2022 13:08:03 GMT+0000 (Coordinated Universal Time)
+                at Fri May 06 2022 15:36:48 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 Thu May 05 2022 13:08:03 GMT+0000 (Coordinated Universal Time)
+                at Fri May 06 2022 15:36:48 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 Thu May 05 2022 13:08:03 GMT+0000 (Coordinated Universal Time)
+                at Fri May 06 2022 15:36:48 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/dist/api/controllers/row/ExternalRequest.js

@@ -146,9 +146,10 @@ var External;
         const thisRow = {};
         // filter the row down to what is actually the row (not joined)
         for (let fieldName of Object.keys(table.schema)) {
-            const value = row[`${table.name}.${fieldName}`] || row[fieldName];
+            const pathValue = row[`${table.name}.${fieldName}`];
+            const value = pathValue != null ? pathValue : row[fieldName];
             // all responses include "select col as table.col" so that overlaps are handled
-            if (value) {
+            if (value != null) {
                 thisRow[fieldName] = value;
             }
         }

package/dist/integrations/firebase.js

@@ -92,7 +92,7 @@ var Firebase;
             this.config = config;
             if (config.serviceAccount) {
                 const serviceAccount = JSON.parse(config.serviceAccount);
-                this.db = new firestore_1.Firestore({
+                this.client = new firestore_1.Firestore({
                     projectId: serviceAccount.project_id,
                     credentials: {
                         client_email: serviceAccount.client_email,
@@ -101,7 +101,7 @@ var Firebase;
                 });
             }
             else {
-                this.db = new firestore_1.Firestore({
+                this.client = new firestore_1.Firestore({
                     projectId: config.projectId,
                     credentials: {
                         client_email: config.email,
@@ -113,7 +113,7 @@ var Firebase;
         create(query) {
             return __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const documentReference = this.db
+                    const documentReference = this.client
                         .collection(query.extra.collection)
                         .doc();
                     yield documentReference.set(Object.assign(Object.assign({}, query.json), { id: documentReference.id }));
@@ -130,7 +130,7 @@ var Firebase;
             return __awaiter(this, void 0, void 0, function* () {
                 try {
                     let snapshot;
-                    const collectionRef = this.db.collection(query.extra.collection);
+                    const collectionRef = this.client.collection(query.extra.collection);
                     if (query.extra.filterField &&
                         query.extra.filter &&
                         query.extra.filterValue) {
@@ -154,17 +154,17 @@ var Firebase;
         update(query) {
             return __awaiter(this, void 0, void 0, function* () {
                 try {
-                    yield this.db
+                    yield this.client
                         .collection(query.extra.collection)
                         .doc(query.json.id)
                         .update(query.json);
-                    return (yield this.db
+                    return (yield this.client
                         .collection(query.extra.collection)
                         .doc(query.json.id)
                         .get()).data();
                 }
                 catch (err) {
-                    console.error("Error writing to firebase", err);
+                    console.error("Error writing to Firestore", err);
                     throw err;
                 }
             });
@@ -172,14 +172,14 @@ var Firebase;
         delete(query) {
             return __awaiter(this, void 0, void 0, function* () {
                 try {
-                    yield this.db
+                    yield this.client
                         .collection(query.extra.collection)
                         .doc(query.json.id)
                         .delete();
                     return true;
                 }
                 catch (err) {
-                    console.error("Error writing to mongodb", err);
+                    console.error("Error deleting from Firestore", err);
                     throw err;
                 }
             });

package/dist/integrations/index.js

@@ -45,6 +45,7 @@ const INTEGRATIONS = {
     [SourceNames.FIREBASE]: firebase.integration,
     [SourceNames.GOOGLE_SHEETS]: googlesheets.integration,
     [SourceNames.REDIS]: redis.integration,
+    [SourceNames.FIREBASE]: firebase.integration,
 };
 // optionally add oracle integration if the oracle binary can be installed
 if (!(process.arch === "arm64" && process.platform === "darwin")) {

package/dist/integrations/postgres.js

@@ -13,7 +13,7 @@ const datasource_1 = require("../definitions/datasource");
 const utils_1 = require("./utils");
 var PostgresModule;
 (function (PostgresModule) {
-    const { Pool } = require("pg");
+    const { Client } = require("pg");
     const Sql = require("./base/sql");
     const { escapeDangerousCharacters } = require("../utilities");
     const JSON_REGEX = /'{.*}'::json/s;
@@ -106,10 +106,7 @@ var PostgresModule;
                         ca: this.config.ca,
                     }
                     : undefined });
-            if (!this.pool) {
-                this.pool = new Pool(newConfig);
-            }
-            this.client = this.pool;
+            this.client = new Client(newConfig);
             this.setSchema();
         }
         getBindingIdentifier() {
@@ -140,16 +137,20 @@ var PostgresModule;
                     // @ts-ignore
                     throw new Error(err);
                 }
+                finally {
+                    yield this.client.end();
+                }
             });
         }
         setSchema() {
-            if (!this.config.schema) {
-                this.config.schema = "public";
-            }
-            this.client.on("connect", (client) => {
-                client.query(`SET search_path TO ${this.config.schema}`);
+            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.COLUMNS_SQL = `select * from information_schema.columns where table_schema = '${this.config.schema}'`;
         }
         /**
          * Fetches the tables from the postgres table and assigns them to the datasource.
@@ -176,6 +177,9 @@ 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) {

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.142",
+    "version": "1.0.145",
     "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.142",
-        "@budibase/client": "^1.0.142",
-        "@budibase/pro": "1.0.142",
-        "@budibase/string-templates": "^1.0.142",
+        "@budibase/backend-core": "^1.0.145",
+        "@budibase/client": "^1.0.145",
+        "@budibase/pro": "1.0.145",
+        "@budibase/string-templates": "^1.0.145",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",