Skip to content

Commit d3fc122

Browse files
authored
fix: fix various schema engine test issues (#5647)
[TML-1501](https://linear.app/prisma-company/issue/TML-1501/fix-broken-se-ci) Removes postgres 9, 10 and 11 from the CI. Also includes some minor test fixes for issues that were unnoticed becuase of the workflow being broken. /test-all
1 parent 9bf76db commit d3fc122

20 files changed

Lines changed: 25 additions & 98 deletions

File tree

.github/workflows/test-query-engine.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,6 @@ jobs:
4949
version: '13'
5050
- name: 'postgres12'
5151
version: '12'
52-
- name: 'postgres11'
53-
version: '11'
54-
- name: 'postgres10'
55-
version: '10'
56-
- name: 'postgres9'
57-
version: '9'
5852
name: 'Postgres Old v${{ matrix.database.version}}'
5953
uses: ./.github/workflows/test-query-engine-template.yml
6054
with:

.github/workflows/test-schema-engine.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,6 @@ jobs:
100100
url: 'mysql://root:prisma@localhost:3306'
101101
- name: mysql_mariadb
102102
url: 'mysql://root:prisma@localhost:3308'
103-
- name: postgres9
104-
url: 'postgresql://postgres:prisma@localhost:5431'
105-
- name: postgres10
106-
url: 'postgresql://postgres:prisma@localhost:5432'
107-
- name: postgres11
108-
url: 'postgresql://postgres:prisma@localhost:5433'
109103
- name: postgres12
110104
url: 'postgresql://postgres:prisma@localhost:5434'
111105
- name: postgres13

.test_database_urls/postgres_10

Lines changed: 0 additions & 1 deletion
This file was deleted.

.test_database_urls/postgres_11

Lines changed: 0 additions & 2 deletions
This file was deleted.

.test_database_urls/postgres_9

Lines changed: 0 additions & 1 deletion
This file was deleted.

Makefile

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -219,24 +219,6 @@ dev-better-sqlite3-wasm: build-qe-wasm build-se-wasm build-driver-adapters-kit-q
219219
test-better-sqlite3-wasm: dev-better-sqlite3-wasm test-qe-st
220220
test-driver-adapter-better-sqlite3-wasm: test-better-sqlite3-wasm
221221

222-
start-postgres9:
223-
docker compose -f docker-compose.yml up --wait -d --remove-orphans postgres9
224-
225-
dev-postgres9: start-postgres9
226-
cp $(CONFIG_PATH)/postgres9 $(CONFIG_FILE)
227-
228-
start-postgres10:
229-
docker compose -f docker-compose.yml up --wait -d --remove-orphans postgres10
230-
231-
dev-postgres10: start-postgres10
232-
cp $(CONFIG_PATH)/postgres10 $(CONFIG_FILE)
233-
234-
start-postgres11:
235-
docker compose -f docker-compose.yml up --wait -d --remove-orphans postgres11
236-
237-
dev-postgres11: start-postgres11
238-
cp $(CONFIG_PATH)/postgres11 $(CONFIG_FILE)
239-
240222
start-postgres12:
241223
docker compose -f docker-compose.yml up --wait -d --remove-orphans postgres12
242224

docker-compose.yml

Lines changed: 8 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -52,41 +52,11 @@ services:
5252
ports:
5353
- '6432:6432'
5454

55-
postgres9:
56-
image: postgres:9.6
57-
restart: unless-stopped
58-
command: postgres -c 'max_connections=1000'
59-
environment:
60-
POSTGRES_PASSWORD: 'prisma'
61-
ports:
62-
- '5431:5432'
63-
networks:
64-
- databases
65-
66-
postgres10:
67-
image: postgres:10
68-
restart: unless-stopped
69-
command: postgres -c 'max_connections=1000'
70-
environment:
71-
POSTGRES_PASSWORD: 'prisma'
72-
ports:
73-
- '5432:5432'
74-
networks:
75-
- databases
76-
77-
postgres11:
78-
image: postgres:11
79-
restart: unless-stopped
80-
command: postgres -c 'max_connections=1000'
81-
environment:
82-
POSTGRES_PASSWORD: 'prisma'
83-
ports:
84-
- '5433:5432'
85-
networks:
86-
- databases
87-
8855
postgres12:
89-
image: postgres:12
56+
build:
57+
context: ./docker/postgres-ext
58+
args:
59+
POSTGRES_VERSION: 12
9060
restart: unless-stopped
9161
command: postgres -c 'max_connections=1000'
9262
environment:
@@ -97,7 +67,10 @@ services:
9767
- databases
9868

9969
postgres13:
100-
image: postgres:13
70+
build:
71+
context: ./docker/postgres-ext
72+
args:
73+
POSTGRES_VERSION: 13
10174
restart: unless-stopped
10275
command: postgres -c 'max_connections=1000'
10376
environment:

query-engine/connector-test-kit-rs/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ As previously stated, the above can be omitted in favor of the `.test_config` co
5858

5959
The config file must be either in the current working folder from which you invoke a test run or in `$WORKSPACE_ROOT`.
6060
It's recommended to use the file-based config as it's easier to switch between providers with an open IDE (reloading env vars would usually require reloading the IDE).
61-
The workspace root makefile contains a series of convenience commands to setup different connector test configs, e.g. `make dev-postgres10` sets up the correct test config file for the tests to pick up.
61+
The workspace root makefile contains a series of convenience commands to setup different connector test configs, e.g. `make dev-postgres12` sets up the correct test config file for the tests to pick up.
6262

6363
On the note of docker containers: Most connectors require an endpoint to run against (notable exception at the moment is SQLite), so you need to provide one. The `docker-compose.yml` in the workspace root offers all possible databases and versions we actively test. The aforementioned `make` commands also set up the container for you together with the .
6464

query-engine/connector-test-kit-rs/test-configs/postgres10

Lines changed: 0 additions & 4 deletions
This file was deleted.

query-engine/connector-test-kit-rs/test-configs/postgres11

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)