From ae930481813670cef06c54cd8ec6d76ad0db5bbc Mon Sep 17 00:00:00 2001
From: Jussi Hallila <jussi@hallila.com>
Date: Mon, 31 Jul 2023 11:34:13 +0200
Subject: [PATCH] Add needed constants and constructs to support PostgreSQL14
 for tests

Signed-off-by: Jussi Hallila <jussi@hallila.com>
---
 .changeset/strong-bobcats-unite.md            |  5 +++
 .../src/database/TestDatabases.test.ts        | 31 +++++++++++++++++++
 .../backend-test-utils/src/database/types.ts  |  8 +++++
 3 files changed, 44 insertions(+)
 create mode 100644 .changeset/strong-bobcats-unite.md

diff --git a/.changeset/strong-bobcats-unite.md b/.changeset/strong-bobcats-unite.md
new file mode 100644
index 0000000000..ef86023d58
--- /dev/null
+++ b/.changeset/strong-bobcats-unite.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-test-utils': patch
+---
+
+Add needed constants and constructs to support PostgreSQL version 14 as test database
diff --git a/packages/backend-test-utils/src/database/TestDatabases.test.ts b/packages/backend-test-utils/src/database/TestDatabases.test.ts
index be29a42806..d766d38815 100644
--- a/packages/backend-test-utils/src/database/TestDatabases.test.ts
+++ b/packages/backend-test-utils/src/database/TestDatabases.test.ts
@@ -59,6 +59,37 @@ describe('TestDatabases', () => {
   describe('each connect', () => {
     const dbs = TestDatabases.create();
 
+    itIfDocker(
+      'obeys a provided connection string for postgres 14',
+      async () => {
+        const { host, port, user, password, stop } =
+          await startPostgresContainer('postgres:14');
+
+        try {
+          // Leave a mark
+          process.env.BACKSTAGE_TEST_DATABASE_POSTGRES14_CONNECTION_STRING = `postgresql://${user}:${password}@${host}:${port}`;
+          const input = await dbs.init('POSTGRES_14');
+          await input.schema.createTable('a', table =>
+            table.string('x').primary(),
+          );
+          await input.insert({ x: 'y' }).into('a');
+
+          // Look for the mark
+          const database = input.client.config.connection.database;
+          const output = knexFactory({
+            client: 'pg',
+            connection: { host, port, user, password, database },
+          });
+          // eslint-disable-next-line jest/no-standalone-expect
+          await expect(output.select('x').from('a')).resolves.toEqual([
+            { x: 'y' },
+          ]);
+        } finally {
+          await stop();
+        }
+      },
+    );
+
     itIfDocker(
       'obeys a provided connection string for postgres 13',
       async () => {
diff --git a/packages/backend-test-utils/src/database/types.ts b/packages/backend-test-utils/src/database/types.ts
index 8c1d6f5193..a7bfdeb12d 100644
--- a/packages/backend-test-utils/src/database/types.ts
+++ b/packages/backend-test-utils/src/database/types.ts
@@ -24,6 +24,7 @@ import { getDockerImageForName } from '../util/getDockerImageForName';
  * @public
  */
 export type TestDatabaseId =
+  | 'POSTGRES_14'
   | 'POSTGRES_13'
   | 'POSTGRES_12'
   | 'POSTGRES_11'
@@ -46,6 +47,13 @@ export type Instance = {
 
 export const allDatabases: Record<TestDatabaseId, TestDatabaseProperties> =
   Object.freeze({
+    POSTGRES_14: {
+      name: 'Postgres 14.x',
+      driver: 'pg',
+      dockerImageName: getDockerImageForName('postgres:14'),
+      connectionStringEnvironmentVariableName:
+        'BACKSTAGE_TEST_DATABASE_POSTGRES14_CONNECTION_STRING',
+    },
     POSTGRES_13: {
       name: 'Postgres 13.x',
       driver: 'pg',