Skip to content

Commit 81cbc20

Browse files
committed
Merge branch 'master' into support-nullable-override
2 parents cbcc76f + afa0634 commit 81cbc20

26 files changed

+3242
-1352
lines changed

.cspell.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,17 @@
11
{
22
"enableFiletypes": ["dockercompose"],
33
"words": [
4+
"adbin",
45
"Adminer",
6+
"adnum",
7+
"adrelid",
8+
"attisdropped",
59
"attname",
10+
"attnotnull",
611
"attnum",
12+
"attrdef",
713
"attrelid",
14+
"atttypid",
815
"bacch",
916
"bacchi",
1017
"Blomberg",
@@ -51,6 +58,7 @@
5158
"multipolygon",
5259
"multirange",
5360
"mysqlx",
61+
"nextval",
5462
"nocase",
5563
"nspname",
5664
"ntext",
@@ -73,6 +81,7 @@
7381
"tablename",
7482
"tediousjs",
7583
"timestamptz",
84+
"timetz",
7685
"tinyblob",
7786
"tinyint",
7887
"tinytext",

.github/workflows/test.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: Test
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
test:
7+
runs-on: ubuntu-latest
8+
9+
steps:
10+
- uses: actions/checkout@v4
11+
12+
- uses: pnpm/action-setup@v4
13+
14+
- uses: actions/setup-node@v4
15+
with:
16+
node-version: 20
17+
cache: 'pnpm'
18+
19+
- name: Install dependencies
20+
run: pnpm install
21+
22+
- name: Start test databases
23+
run: docker compose up -d --wait
24+
25+
- name: Wait for LibSQL
26+
run: pnpx wait-on http://localhost:8080/health
27+
28+
- name: Run tests
29+
run: pnpm test
30+
31+
- name: Stop databases
32+
if: always()
33+
run: docker compose down -v

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ npm install kysely mysql2
2929
npm install kysely better-sqlite3
3030

3131
# MSSQL
32-
npm install kysely tedious tarn @tediousjs/connection-string@0.5.0
32+
npm install kysely tedious tarn @tediousjs/connection-string@1.0.0
3333

3434
# LibSQL
3535
npm install @libsql/kysely-libsql

docker-compose.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
version: '3.9'
2-
31
services:
42
kysely_codegen_adminer:
53
container_name: kysely_codegen_adminer
@@ -24,6 +22,12 @@ services:
2422
ports:
2523
- 3306:3306
2624
restart: always
25+
healthcheck:
26+
test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u", "user", "-ppassword"]
27+
interval: 2s
28+
timeout: 10s
29+
retries: 10
30+
start_period: 10s
2731
kysely_codegen_postgres:
2832
container_name: kysely_codegen_postgres
2933
environment:
@@ -34,3 +38,9 @@ services:
3438
ports:
3539
- 5433:5432
3640
restart: always
41+
healthcheck:
42+
test: ["CMD-SHELL", "pg_isready -U user -d database"]
43+
interval: 2s
44+
timeout: 5s
45+
retries: 5
46+
start_period: 5s

package.json

Lines changed: 44 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
"url": "https://github.com/RobinBlomberg/kysely-codegen/issues"
1717
},
1818
"homepage": "https://github.com/RobinBlomberg/kysely-codegen#readme",
19+
"engines": {
20+
"node": ">=20.0.0"
21+
},
22+
"packageManager": "pnpm@10.15.1",
1923
"scripts": {
2024
"build": "rimraf dist && tsc --project ./tsconfig.build.json",
2125
"check:types": "tsc --noEmit",
@@ -28,7 +32,8 @@
2832
"ci:test": "pnpm test",
2933
"ci:unused": "knip",
3034
"dev": "tsx watch ./src/cli/bin.ts",
31-
"docker:up": "docker-compose up -d",
35+
"docker:up": "docker compose up -d --wait",
36+
"docker:wait": "wait-on tcp:5433 tcp:3306 http://localhost:8080/health",
3237
"fix": "run-s fix:*",
3338
"fix:eslint": "eslint --fix src",
3439
"fix:prettier": "prettier --write src",
@@ -44,64 +49,58 @@
4449
"dependencies": {
4550
"chalk": "4.1.2",
4651
"cosmiconfig": "^9.0.0",
47-
"dotenv": "^17.2.1",
48-
"dotenv-expand": "^12.0.2",
49-
"git-diff": "^2.0.6",
52+
"diff": "^8.0.3",
53+
"dotenv": "^17.2.4",
54+
"dotenv-expand": "^12.0.3",
5055
"micromatch": "^4.0.8",
5156
"minimist": "^1.2.8",
5257
"pluralize": "^8.0.0",
53-
"zod": "^4.1.5"
58+
"zod": "^4.3.6"
5459
},
5560
"devDependencies": {
56-
"@babel/core": "^7.28.3",
57-
"@babel/eslint-parser": "^7.28.0",
61+
"@babel/core": "^7.29.0",
62+
"@babel/eslint-parser": "^7.28.6",
5863
"@libsql/kysely-libsql": "^0.4.1",
5964
"@robinblomberg/eslint-config-prettier": "^0.1.4",
60-
"@robinblomberg/eslint-config-robinblomberg": "0.30.1",
65+
"@robinblomberg/eslint-config-robinblomberg": "0.32.0",
6166
"@robinblomberg/prettier-config": "^0.2.0",
62-
"@tediousjs/connection-string": "^0.5.0",
67+
"@tediousjs/connection-string": "^1.0.0",
6368
"@types/better-sqlite3": "^7.6.13",
64-
"@types/bun": "^1.2.21",
69+
"@types/bun": "^1.3.8",
6570
"@types/git-diff": "^2.0.7",
66-
"@types/micromatch": "^4.0.9",
71+
"@types/micromatch": "^4.0.10",
6772
"@types/minimist": "^1.2.5",
68-
"@types/node": "^24.3.0",
69-
"@types/pg": "^8.15.5",
73+
"@types/node": "^25.2.1",
74+
"@types/pg": "^8.16.0",
7075
"@types/pluralize": "^0.0.33",
71-
"@typescript-eslint/eslint-plugin": "^8.41.0",
72-
"@typescript-eslint/parser": "^8.41.0",
73-
"better-sqlite3": "^12.2.0",
74-
"cspell-cli": "^9.2.0",
76+
"@typescript-eslint/eslint-plugin": "^8.54.0",
77+
"@typescript-eslint/parser": "^8.54.0",
78+
"better-sqlite3": "^12.6.2",
79+
"cspell-cli": "^9.6.0",
7580
"eslint": "^8.57.0",
76-
"eslint-plugin-import": "^2.32.0",
77-
"eslint-plugin-jsdoc": "48.11.0",
78-
"eslint-plugin-sonarjs": "^3.0.5",
79-
"eslint-plugin-sort-exports": "^0.9.1",
80-
"eslint-plugin-sort-keys": "^2.3.5",
81-
"eslint-plugin-storybook": "^9.1.3",
82-
"eslint-plugin-unicorn": "56.0.1",
83-
"execa": "^9.6.0",
84-
"knip": "^5.63.0",
85-
"kysely": "^0.28.5",
81+
"execa": "^9.6.1",
82+
"knip": "^5.83.1",
83+
"kysely": "^0.28.11",
8684
"kysely-bun-sqlite": "^0.4.0",
8785
"kysely-bun-worker": "^1.2.1",
8886
"madge": "^8.0.0",
89-
"mysql2": "^3.14.4",
87+
"mysql2": "^3.16.3",
9088
"npm-run-all": "^4.1.5",
91-
"pg": "^8.16.3",
89+
"pg": "^8.18.0",
9290
"postgres-interval": "^4.0.2",
93-
"prettier": "^3.6.2",
94-
"rimraf": "^6.0.1",
91+
"prettier": "^3.8.1",
92+
"rimraf": "^6.1.2",
9593
"tarn": "^3.0.2",
96-
"tedious": "^18.6.1",
94+
"tedious": "^19.2.0",
9795
"ts-dedent": "^2.2.0",
98-
"tsx": "^4.20.5",
99-
"typescript": "^5.9.2",
100-
"vitest": "^3.2.4"
96+
"tsx": "^4.21.0",
97+
"typescript": "^5.9.3",
98+
"vitest": "^4.0.18",
99+
"wait-on": "^9.0.3"
101100
},
102101
"peerDependencies": {
103102
"@libsql/kysely-libsql": ">=0.3.0 <0.5.0",
104-
"@tediousjs/connection-string": ">=0.5.0 <0.6.0",
103+
"@tediousjs/connection-string": "^1.0.0",
105104
"better-sqlite3": ">=7.6.2 <13.0.0",
106105
"kysely": ">=0.27.0 <1.0.0",
107106
"kysely-bun-sqlite": ">=0.3.2 <1.0.0",
@@ -143,10 +142,16 @@
143142
"optional": true
144143
}
145144
},
146-
"engines": {
147-
"node": ">=20.0.0"
145+
"pnpm": {
146+
"overrides": {
147+
"@isaacs/brace-expansion": ">=5.0.1",
148+
"js-yaml": ">=4.1.1",
149+
"jws": ">=3.2.3",
150+
"lodash": ">=4.17.23",
151+
"tar-fs": ">=2.1.4",
152+
"vite": ">=7.1.11"
153+
}
148154
},
149-
"packageManager": "pnpm@10.15.1",
150155
"eslintConfig": {
151156
"extends": [
152157
"@robinblomberg/robinblomberg",

0 commit comments

Comments
 (0)