Skip to content

Commit aeb7535

Browse files
Merge pull request #1338 from datajoint/feat/database-adapters
feat: Add PostgreSQL multi-backend support (DataJoint 2.1)
2 parents f4b0258 + 1d25762 commit aeb7535

29 files changed

+5752
-367
lines changed

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,3 +195,8 @@ datajoint.json
195195

196196
# Test outputs
197197
*_test_summary.txt
198+
199+
# Swap files
200+
*.swp
201+
*.swo
202+
*~

docker-compose.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,19 @@ services:
2424
timeout: 30s
2525
retries: 5
2626
interval: 15s
27+
postgres:
28+
image: postgres:${POSTGRES_VER:-15}
29+
environment:
30+
- POSTGRES_PASSWORD=${PG_PASS:-password}
31+
- POSTGRES_USER=${PG_USER:-postgres}
32+
- POSTGRES_DB=${PG_DB:-test}
33+
ports:
34+
- "5432:5432"
35+
healthcheck:
36+
test: [ "CMD-SHELL", "pg_isready -U postgres" ]
37+
timeout: 30s
38+
retries: 5
39+
interval: 15s
2740
minio:
2841
image: minio/minio:${MINIO_VER:-RELEASE.2025-02-28T09-55-16Z}
2942
environment:
@@ -52,6 +65,8 @@ services:
5265
depends_on:
5366
db:
5467
condition: service_healthy
68+
postgres:
69+
condition: service_healthy
5570
minio:
5671
condition: service_healthy
5772
environment:
@@ -61,6 +76,10 @@ services:
6176
- DJ_TEST_HOST=db
6277
- DJ_TEST_USER=datajoint
6378
- DJ_TEST_PASSWORD=datajoint
79+
- DJ_PG_HOST=postgres
80+
- DJ_PG_USER=postgres
81+
- DJ_PG_PASS=password
82+
- DJ_PG_PORT=5432
6483
- S3_ENDPOINT=minio:9000
6584
- S3_ACCESS_KEY=datajoint
6685
- S3_SECRET_KEY=datajoint

0 commit comments

Comments
 (0)