Skip to content

Commit

Permalink
Merge branch 'master' into feat/migrator
Browse files Browse the repository at this point in the history
  • Loading branch information
igalklebanov authored Nov 7, 2023
2 parents 0e6da76 + 56facee commit 534cabc
Show file tree
Hide file tree
Showing 76 changed files with 7,098 additions and 1,621 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
matrix:
node-version: [16.x, 18.x, 20.x]
bun-version: [0.6.x]
bun-version: [1.x]
deno-version: [1.34.x]

steps:
Expand Down
26 changes: 25 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,29 @@
version: '3'
services:
# credit to Knex.js team for the following mssql setup here:
mssql:
image: mcr.microsoft.com/mssql/server:2022-latest
ports:
- '21433:1433'
environment:
ACCEPT_EULA: Y
MSSQL_PID: Express
SA_PASSWORD: KyselyTest0
healthcheck:
test: /opt/mssql-tools/bin/sqlcmd -S mssql -U sa -P 'KyselyTest0' -Q 'select 1'
waitmssql:
image: mcr.microsoft.com/mssql/server:2017-latest
links:
- mssql
depends_on:
- mssql
environment:
MSSQL_PID: Express
entrypoint:
- bash
- -c
# https://docs.microsoft.com/en-us/sql/relational-databases/logs/control-transaction-durability?view=sql-server-ver15#bkmk_DbControl
- 'until /opt/mssql-tools/bin/sqlcmd -S mssql -U sa -P KyselyTest0 -d master -Q "CREATE DATABASE kysely_test; ALTER DATABASE kysely_test SET ALLOW_SNAPSHOT_ISOLATION ON; ALTER DATABASE kysely_test SET DELAYED_DURABILITY = FORCED"; do sleep 5; done'
mysql:
image: 'mysql/mysql-server'
environment:
Expand All @@ -17,4 +41,4 @@ services:
POSTGRES_USER: kysely
POSTGRES_HOST_AUTH_METHOD: trust
ports:
- '5434:5432'
- '5434:5432'
Loading

0 comments on commit 534cabc

Please sign in to comment.