From 76a68a12f0b92f1c29903dd5a6cbd5a85ebcdd75 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Thu, 31 Oct 2024 14:33:37 +0000 Subject: [PATCH 1/3] Fix handling of the Postgres money field. --- packages/backend-core/src/sql/sql.ts | 9 ++-- .../src/integration-test/postgres.spec.ts | 52 ++++++++++++++++++- 2 files changed, 55 insertions(+), 6 deletions(-) diff --git a/packages/backend-core/src/sql/sql.ts b/packages/backend-core/src/sql/sql.ts index d94b817ba4e..6043a8713e9 100644 --- a/packages/backend-core/src/sql/sql.ts +++ b/packages/backend-core/src/sql/sql.ts @@ -300,11 +300,9 @@ class InternalBuilder { const columnSchema = schema[column] if (this.SPECIAL_SELECT_CASES.POSTGRES_MONEY(columnSchema)) { - // TODO: figure out how to express this safely without string - // interpolation. - return this.knex.raw(`??::money::numeric as "${field}"`, [ + return this.knex.raw(`??::money::numeric as ??`, [ this.rawQuotedIdentifier([table, column].join(".")), - field, + this.knex.raw(this.quote(field)), ]) } @@ -314,8 +312,9 @@ class InternalBuilder { // TODO: figure out how to express this safely without string // interpolation. - return this.knex.raw(`CONVERT(varchar, ??, 108) as "${field}"`, [ + return this.knex.raw(`CONVERT(varchar, ??, 108) as ??`, [ this.rawQuotedIdentifier(field), + this.knex.raw(this.quote(field)), ]) } diff --git a/packages/server/src/integration-test/postgres.spec.ts b/packages/server/src/integration-test/postgres.spec.ts index f2e0382deb8..d6978e743f5 100644 --- a/packages/server/src/integration-test/postgres.spec.ts +++ b/packages/server/src/integration-test/postgres.spec.ts @@ -1,5 +1,5 @@ import * as setup from "../api/routes/tests/utilities" -import { Datasource, FieldType } from "@budibase/types" +import { Datasource, FieldType, Table } from "@budibase/types" import _ from "lodash" import { generator } from "@budibase/backend-core/tests" import { @@ -229,4 +229,54 @@ describe("postgres integrations", () => { ).toBeUndefined() }) }) + + describe.only("money field 💰", () => { + const tableName = "moneytable" + let table: Table + + beforeAll(async () => { + await client.raw(` + CREATE TABLE ${tableName} ( + id serial PRIMARY KEY, + price money + ) + `) + const response = await config.api.datasource.fetchSchema({ + datasourceId: datasource._id!, + }) + table = response.datasource.entities![tableName] + }) + + it("should be able to import a money field", async () => { + expect(table).toBeDefined() + expect(table?.schema.price.type).toBe(FieldType.NUMBER) + }) + + it("should be able to search a money field", async () => { + await config.api.row.bulkImport(table._id!, { + rows: [{ price: 200 }, { price: 300 }], + }) + + const { rows } = await config.api.row.search(table._id!, { + query: { + equal: { + price: 200, + }, + }, + }) + expect(rows).toHaveLength(1) + expect(rows[0].price).toBe("200.00") + }) + + it("should be able to update a money field", async () => { + let row = await config.api.row.save(table._id!, { price: 200 }) + expect(row.price).toBe("200.00") + + row = await config.api.row.save(table._id!, { ...row, price: 300 }) + expect(row.price).toBe("300.00") + + row = await config.api.row.save(table._id!, { ...row, price: "400.00" }) + expect(row.price).toBe("400.00") + }) + }) }) From 7026a35e046e02aa5d93cfc8f12f16a5879c2d0c Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Thu, 31 Oct 2024 14:46:57 +0000 Subject: [PATCH 2/3] Remove focus test. --- packages/server/src/integration-test/postgres.spec.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/server/src/integration-test/postgres.spec.ts b/packages/server/src/integration-test/postgres.spec.ts index d6978e743f5..401e1825786 100644 --- a/packages/server/src/integration-test/postgres.spec.ts +++ b/packages/server/src/integration-test/postgres.spec.ts @@ -230,7 +230,7 @@ describe("postgres integrations", () => { }) }) - describe.only("money field 💰", () => { + describe("money field 💰", () => { const tableName = "moneytable" let table: Table @@ -277,6 +277,9 @@ describe("postgres integrations", () => { row = await config.api.row.save(table._id!, { ...row, price: "400.00" }) expect(row.price).toBe("400.00") + + row = await config.api.row.save(table._id!, { ...row, price: "400.123" }) + expect(row.price).toBe("400.123") }) }) }) From 91dfa9a3780739e4933494300447e7cef6bba931 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Thu, 31 Oct 2024 14:47:14 +0000 Subject: [PATCH 3/3] Remove failing test. --- packages/server/src/integration-test/postgres.spec.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/server/src/integration-test/postgres.spec.ts b/packages/server/src/integration-test/postgres.spec.ts index 401e1825786..7654d84551c 100644 --- a/packages/server/src/integration-test/postgres.spec.ts +++ b/packages/server/src/integration-test/postgres.spec.ts @@ -277,9 +277,6 @@ describe("postgres integrations", () => { row = await config.api.row.save(table._id!, { ...row, price: "400.00" }) expect(row.price).toBe("400.00") - - row = await config.api.row.save(table._id!, { ...row, price: "400.123" }) - expect(row.price).toBe("400.123") }) }) })