Skip to content

Commit ea3a312

Browse files
committed
Merge remote-tracking branch 'finos/feat/postgres' into feat/postgres-repo-users
# Conflicts: # test/db/postgres/schemaMigrations.integration.test.ts
2 parents 1b59030 + a1196fe commit ea3a312

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ name: CI
55

66
on:
77
push:
8-
branches: [main]
8+
branches: [main, feat/postgres]
99
pull_request:
10-
branches: [main]
10+
branches: [main, feat/postgres]
1111

1212
permissions:
1313
pull-requests: write

test/db/postgres/schemaMigrations.integration.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ describe.runIf(shouldRunPostgresTests)('PostgreSQL Schema Migration Integration
5353
const versions = await query<{ version: number }>(
5454
'SELECT version FROM schema_migrations ORDER BY version',
5555
);
56-
expect(versions.rows.map((row) => row.version)).toEqual([1, 2, 3, 4]);
56+
expect(versions.rows.map((row) => row.version)).toEqual([1, 2, 3, 4, 5]);
5757

5858
const tables = await query<{ tablename: string }>(
5959
`SELECT tablename FROM pg_tables
@@ -90,7 +90,7 @@ describe.runIf(shouldRunPostgresTests)('PostgreSQL Schema Migration Integration
9090
await connect();
9191

9292
const versions = await query<{ version: number }>('SELECT version FROM schema_migrations');
93-
expect(versions.rows.map((row) => row.version)).toEqual([1, 2, 3, 4]);
93+
expect(versions.rows.map((row) => row.version)).toEqual([1, 2, 3, 4, 5]);
9494
});
9595

9696
it('backfills existing JSONB repo permissions into repo_users (single, multi, same user in both roles)', async () => {
@@ -140,7 +140,7 @@ describe.runIf(shouldRunPostgresTests)('PostgreSQL Schema Migration Integration
140140
const versions = await pool.query<{ version: number }>(
141141
'SELECT version FROM schema_migrations ORDER BY version',
142142
);
143-
expect(versions.rows.map((r) => r.version)).toEqual([1, 2, 3, 4]);
143+
expect(versions.rows.map((r) => r.version)).toEqual([1, 2, 3, 4, 5]);
144144

145145
// The legacy JSONB column is gone, dropped by v4.
146146
const usersCol = await pool.query(

0 commit comments

Comments
 (0)