Fix tests after merge

packages/server/specs/openapi.json

@@ -817,6 +817,7 @@
                       "type": "string",
                       "enum": [
                         "string",
+                        "barcodeqr",
                         "longform",
                         "options",
                         "number",
@@ -828,8 +829,7 @@
                         "formula",
                         "auto",
                         "json",
-                        "internal",
+                        "internal"
-                        "barcodeqr"
                       ],
                       "description": "Defines the type of the column, most explain themselves, a link column is a relationship."
                     },
@@ -1021,6 +1021,7 @@
                           "type": "string",
                           "enum": [
                             "string",
+                            "barcodeqr",
                             "longform",
                             "options",
                             "number",
@@ -1032,8 +1033,7 @@
                             "formula",
                             "auto",
                             "json",
-                            "internal",
+                            "internal"
-                            "barcodeqr"
                           ],
                           "description": "Defines the type of the column, most explain themselves, a link column is a relationship."
                         },
@@ -1236,6 +1236,7 @@
                             "type": "string",
                             "enum": [
                               "string",
+                              "barcodeqr",
                               "longform",
                               "options",
                               "number",
@@ -1247,8 +1248,7 @@
                               "formula",
                               "auto",
                               "json",
-                              "internal",
+                              "internal"
-                              "barcodeqr"
                             ],
                             "description": "Defines the type of the column, most explain themselves, a link column is a relationship."
                           },

packages/server/specs/openapi.yaml

@@ -603,6 +603,7 @@ components:
                     type: string
                     enum:
                       - string
+                      - barcodeqr
                       - longform
                       - options
                       - number
@@ -615,7 +616,6 @@ components:
                       - auto
                       - json
                       - internal
-                      - barcodeqr
                     description: Defines the type of the column, most explain themselves, a link
                       column is a relationship.
                   constraints:
@@ -766,6 +766,7 @@ components:
                         type: string
                         enum:
                           - string
+                          - barcodeqr
                           - longform
                           - options
                           - number
@@ -778,7 +779,6 @@ components:
                           - auto
                           - json
                           - internal
-                          - barcodeqr
                         description: Defines the type of the column, most explain themselves, a link
                           column is a relationship.
                       constraints:
@@ -936,6 +936,7 @@ components:
                           type: string
                           enum:
                             - string
+                            - barcodeqr
                             - longform
                             - options
                             - number
@@ -948,7 +949,6 @@ components:
                             - auto
                             - json
                             - internal
-                            - barcodeqr
                           description: Defines the type of the column, most explain themselves, a link
                             column is a relationship.
                         constraints:

packages/server/src/integration-test/postgres.spec.ts

@@ -1,4 +1,3 @@
-import { faker } from "@faker-js/faker"
 import {
   generateMakeRequest,
   MakeRequestResponse,
@@ -14,19 +13,24 @@ import {
   Table,
 } from "@budibase/types"
 import _ from "lodash"
+import { generator } from "@budibase/backend-core/tests"
+import { utils } from "@budibase/backend-core"
 
 const config = setup.getConfig()!
 
 jest.unmock("node-fetch")
 
 // TODO: Waiting for the test image to exist
-describe.skip("row api - postgres", () => {
+describe("row api - postgres", () => {
   let apiKey,
     makeRequest: MakeRequestResponse,
     postgresDatasource: Datasource,
     postgresTable: Table,
     auxPostgresTable: Table
 
+  const host = generator.ip()
+  const port = generator.natural()
+
   beforeEach(async () => {
     await config.init()
     apiKey = await config.generateApiKey()
@@ -36,8 +40,8 @@ describe.skip("row api - postgres", () => {
         source: SourceName.POSTGRES,
         plus: true,
         config: {
-          host: "192.168.1.98",
+          host,
-          port: 54321,
+          port,
           database: "postgres",
           user: "root",
           password: "root",
@@ -52,7 +56,7 @@ describe.skip("row api - postgres", () => {
     makeRequest = generateMakeRequest(apiKey, true)
 
     postgresTable = await config.createTable({
-      name: faker.lorem.word(),
+      name: generator.word(),
       schema: {
         name: {
           name: "name",
@@ -74,7 +78,7 @@ describe.skip("row api - postgres", () => {
     })
 
     auxPostgresTable = await config.createTable({
-      name: faker.lorem.word(),
+      name: generator.word(),
       schema: {
         title: {
           name: "title",
@@ -105,9 +109,9 @@ describe.skip("row api - postgres", () => {
 
   function createRandomRow() {
     return {
-      name: faker.name.fullName(),
+      name: generator.name(),
-      description: faker.lorem.paragraphs(),
+      description: generator.paragraph(),
-      value: +faker.random.numeric(),
+      value: generator.integer(),
     }
   }
 
@@ -150,9 +154,9 @@ describe.skip("row api - postgres", () => {
       config: {
         ca: false,
         database: "postgres",
-        host: "192.168.1.98",
+        host,
-        password: "root",
+        password: "--secret-value--",
-        port: 54321,
+        port,
         rejectUnauthorized: false,
         schema: "public",
         ssl: false,
@@ -213,8 +217,8 @@ describe.skip("row api - postgres", () => {
     test("Given than a row exists, updating it persists it", async () => {
       let { row } = _.sample(await populateRows(10))!
 
-      const newName = faker.random.words(3)
+      const newName = generator.name()
-      const newValue = +faker.random.numeric()
+      const newValue = generator.integer()
       const updatedRow = {
         ...row,
         name: newName,
@@ -311,7 +315,7 @@ describe.skip("row api - postgres", () => {
 
       const foreignRow = await config.createRow({
         tableId: auxPostgresTable._id,
-        title: faker.random.alphaNumeric(10),
+        title: generator.sentence(),
         linkedField: row._id,
       })
 
@@ -376,17 +380,17 @@ describe.skip("row api - postgres", () => {
     })
 
     test("Querying by a string field returns the rows with field containing or starting by that value", async () => {
-      const name = faker.name.fullName()
+      const name = generator.name()
       const rowsToFilter = [
         ...Array(2).fill({
           name,
-          description: faker.lorem.paragraphs(),
+          description: generator.paragraph(),
-          value: +faker.random.numeric(),
+          value: generator.integer(),
         }),
         ...Array(2).fill({
-          name: `${name}${faker.random.alphaNumeric(5)}`,
+          name: `${name}${utils.newid()}`,
-          description: faker.lorem.paragraphs(),
+          description: generator.paragraph(),
-          value: +faker.random.numeric(),
+          value: generator.integer(),
         }),
       ]
 
@@ -525,7 +529,7 @@ describe.skip("row api - postgres", () => {
 
       const foreignRow = await config.createRow({
         tableId: auxPostgresTable._id,
-        title: faker.random.alphaNumeric(10),
+        title: generator.name(),
         linkedField: row._id,
       })