Merge branch 'master' into fix/copy-id-rev

packages/server/src/api/routes/tests/search.spec.ts

@@ -402,6 +402,7 @@ describe.each([
         },
       ])
     })
+
     // TODO(samwho): fix for SQS
     !isSqs &&
       it("should match the session user id in a multi user field", async () => {
@@ -419,6 +420,7 @@ describe.each([
         ])
       })
 
+    // TODO(samwho): fix for SQS
     !isSqs &&
       it("should not match the session user id in a multi user field", async () => {
         await expectQuery({

packages/server/src/sdk/app/rows/search/tests/internal.spec.ts

@@ -1,117 +0,0 @@
-import {
-  FieldType,
-  Row,
-  Table,
-  RowSearchParams,
-  INTERNAL_TABLE_SOURCE_ID,
-  TableSourceType,
-} from "@budibase/types"
-import TestConfiguration from "../../../../../tests/utilities/TestConfiguration"
-import { search } from "../internal"
-import {
-  expectAnyInternalColsAttributes,
-  generator,
-} from "@budibase/backend-core/tests"
-
-describe("internal", () => {
-  const config = new TestConfiguration()
-
-  const tableData: Table = {
-    name: generator.word(),
-    type: "table",
-    sourceId: INTERNAL_TABLE_SOURCE_ID,
-    sourceType: TableSourceType.INTERNAL,
-    schema: {
-      name: {
-        name: "name",
-        type: FieldType.STRING,
-        constraints: {
-          type: FieldType.STRING,
-        },
-      },
-      surname: {
-        name: "surname",
-        type: FieldType.STRING,
-        constraints: {
-          type: FieldType.STRING,
-        },
-      },
-      age: {
-        name: "age",
-        type: FieldType.NUMBER,
-        constraints: {
-          type: FieldType.NUMBER,
-        },
-      },
-      address: {
-        name: "address",
-        type: FieldType.STRING,
-        constraints: {
-          type: FieldType.STRING,
-        },
-      },
-    },
-  }
-
-  beforeAll(async () => {
-    await config.init()
-  })
-
-  describe("search", () => {
-    const rows: Row[] = []
-    beforeAll(async () => {
-      await config.createTable(tableData)
-      for (let i = 0; i < 10; i++) {
-        rows.push(
-          await config.createRow({
-            name: generator.first(),
-            surname: generator.last(),
-            age: generator.age(),
-            address: generator.address(),
-          })
-        )
-      }
-    })
-
-    it("default search returns all the data", async () => {
-      await config.doInContext(config.appId, async () => {
-        const tableId = config.table!._id!
-
-        const searchParams: RowSearchParams = {
-          tableId,
-          query: {},
-        }
-        const result = await search(searchParams, config.table!)
-
-        expect(result.rows).toHaveLength(10)
-        expect(result.rows).toEqual(
-          expect.arrayContaining(rows.map(r => expect.objectContaining(r)))
-        )
-      })
-    })
-
-    it("querying by fields will always return data attribute columns", async () => {
-      await config.doInContext(config.appId, async () => {
-        const tableId = config.table!._id!
-
-        const searchParams: RowSearchParams = {
-          tableId,
-          query: {},
-          fields: ["name", "age"],
-        }
-        const result = await search(searchParams, config.table!)
-
-        expect(result.rows).toHaveLength(10)
-        expect(result.rows).toEqual(
-          expect.arrayContaining(
-            rows.map(r => ({
-              ...expectAnyInternalColsAttributes,
-              name: r.name,
-              age: r.age,
-            }))
-          )
-        )
-      })
-    })
-  })
-})