@budibase/server 2.0.15 → 2.0.17

package/dist/api/controllers/datasource.js

@@ -56,6 +56,7 @@ exports.buildSchemaFromDb = function (ctx) {
         else {
             datasource.entities = tables;
         }
+        setDefaultDisplayColumns(datasource);
         const dbResp = yield db.put(datasource);
         datasource._rev = dbResp.rev;
         const response = { datasource };
@@ -65,6 +66,21 @@ exports.buildSchemaFromDb = function (ctx) {
         ctx.body = response;
     });
 };
+/**
+ * Make sure all datasource entities have a display name selected
+ */
+const setDefaultDisplayColumns = datasource => {
+    //
+    for (let entity of Object.values(datasource.entities)) {
+        if (entity.primaryDisplay) {
+            continue;
+        }
+        const notAutoColumn = Object.values(entity.schema).find(schema => !schema.autocolumn);
+        if (notAutoColumn) {
+            entity.primaryDisplay = notAutoColumn.name;
+        }
+    }
+};
 /**
  * Check for variables that have been updated or removed and invalidate them.
  */
@@ -130,6 +146,7 @@ exports.save = function (ctx) {
             const { tables, error } = yield buildSchemaHelper(datasource);
             schemaError = error;
             datasource.entities = tables;
+            setDefaultDisplayColumns(datasource);
         }
         const dbResp = yield db.put(datasource);
         yield events.datasource.created(datasource);
@@ -201,21 +218,10 @@ function updateError(error, newError, tables) {
     return error;
 }
 const buildSchemaHelper = (datasource) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
     const Connector = yield getIntegration(datasource.source);
     // Connect to the DB and build the schema
     const connector = new Connector(datasource.config);
     yield connector.buildSchema(datasource._id, datasource.entities);
-    // make sure they all have a display name selected
-    for (let entity of Object.values((_a = datasource.entities) !== null && _a !== void 0 ? _a : {})) {
-        if (entity.primaryDisplay) {
-            continue;
-        }
-        const notAutoColumn = Object.values(entity.schema).find(schema => !schema.autocolumn);
-        if (notAutoColumn) {
-            entity.primaryDisplay = notAutoColumn.name;
-        }
-    }
     const errors = connector.schemaErrors;
     let error = null;
     if (errors && Object.keys(errors).length > 0) {

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

@@ -133,7 +133,10 @@ class QueryBuilder {
             value = `${value}`.replace(/[ #+\-&|!(){}\]^"~*?:\\]/g, "\\$&");
         }
         // Wrap in quotes
-        if (hasVersion && wrap) {
+        if (originalType === "string" && !isNaN(value) && !escape) {
+            value = `"${value}"`;
+        }
+        else if (hasVersion && wrap) {
             value = originalType === "number" ? value : `"${value}"`;
         }
         return value;

package/dist/package.json

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