@budibase/server 2.0.18 → 2.0.19

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.0.18",
+  "version": "2.0.19",
   "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.18",
-    "@budibase/client": "^2.0.18",
-    "@budibase/pro": "2.0.17",
-    "@budibase/string-templates": "^2.0.18",
-    "@budibase/types": "^2.0.18",
+    "@budibase/backend-core": "^2.0.19",
+    "@budibase/client": "^2.0.19",
+    "@budibase/pro": "2.0.18",
+    "@budibase/string-templates": "^2.0.19",
+    "@budibase/types": "^2.0.19",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -199,5 +199,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "a51545dd3e4499ef3e1c10e7a551861a58af5ca0"
+  "gitHead": "3059cd463484856e041afd8766f61ee5d5e39df5"
 }

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

@@ -145,7 +145,7 @@ class QueryBuilder {
    * @param options The preprocess options
    * @returns {string|*}
    */
-  preprocess(value, { escape, lowercase, wrap } = {}) {
+  preprocess(value, { escape, lowercase, wrap, type } = {}) {
     const hasVersion = !!this.version
     // Determine if type needs wrapped
     const originalType = typeof value
@@ -159,7 +159,7 @@ class QueryBuilder {
     }
 
     // Wrap in quotes
-    if (originalType === "string" && !isNaN(value) && !escape) {
+    if (originalType === "string" && !isNaN(value) && !type) {
       value = `"${value}"`
     } else if (hasVersion && wrap) {
       value = originalType === "number" ? value : `"${value}"`
@@ -256,6 +256,7 @@ class QueryBuilder {
         value = builder.preprocess(value, {
           escape: true,
           lowercase: true,
+          type: "string",
         })
         return `${key}:${value}*`
       })
@@ -284,6 +285,7 @@ class QueryBuilder {
         value = builder.preprocess(value, {
           escape: true,
           lowercase: true,
+          type: "fuzzy",
         })
         return `${key}:${value}~`
       })

package/src/api/routes/tests/internalSearch.spec.js

@@ -173,4 +173,24 @@ describe("internal search", () => {
     }, PARAMS)
     checkLucene(response, `*:* AND NOT column:(a AND b AND c)`, PARAMS)
   })
+
+  it("test equal without version query", async () => {
+    PARAMS.version = null
+    const response = await search.paginatedSearch({
+      equal: {
+        "column": "1",
+      }
+    }, PARAMS)
+    
+    const query = response.rows[0].query
+    const json = JSON.parse(query)
+    if (PARAMS.sort) {
+      expect(json.sort).toBe(`${PARAMS.sort}<${PARAMS.sortType}>`)
+    }
+    if (PARAMS.bookmark) {
+      expect(json.bookmark).toBe(PARAMS.bookmark)
+    }
+    expect(json.include_docs).toBe(true)
+    expect(json.q).toBe(`(*:* AND column:"1") AND tableId:${PARAMS.tableId}`)
+  })
 })