Skip to content

Commit

Permalink
[drizzle] fix aliased table relations
Browse files Browse the repository at this point in the history
  • Loading branch information
hayes committed Sep 8, 2024
1 parent 5d8ef14 commit a6d105b
Show file tree
Hide file tree
Showing 51 changed files with 2,871 additions and 2,803 deletions.
5 changes: 5 additions & 0 deletions .changeset/many-boxes-brush.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@pothos/plugin-drizzle": patch
---

fix aliased table relations
10 changes: 5 additions & 5 deletions examples/complex-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"seed": "tsx prisma/seed.ts"
},
"dependencies": {
"@faker-js/faker": "^8.4.1",
"@faker-js/faker": "^9.0.0",
"@graphql-typed-document-node/core": "^3.2.0",
"@pothos/core": "workspace:*",
"@pothos/plugin-dataloader": "workspace:*",
Expand All @@ -26,11 +26,11 @@
"@pothos/plugin-scope-auth": "workspace:*",
"@pothos/plugin-simple-objects": "workspace:*",
"@pothos/plugin-zod": "workspace:*",
"@prisma/client": "^5.17.0",
"@prisma/client": "^5.19.1",
"graphql": "^16.8.1",
"graphql-scalars": "^1.23.0",
"graphql-yoga": "5.6.2",
"prisma": "^5.17.0",
"graphql-yoga": "5.7.0",
"prisma": "^5.19.1",
"react": "^18.3.1",
"urql": "^4.1.0",
"zod": "^3.23.8"
Expand All @@ -43,7 +43,7 @@
"@graphql-codegen/client-preset": "4.3.3",
"@graphql-codegen/introspection": "4.0.3",
"@graphql-codegen/schema-ast": "^4.1.0",
"@types/node": "^22.0.2",
"@types/node": "^22.5.4",
"typescript": "^5.5.4"
}
}
4 changes: 2 additions & 2 deletions examples/envelope-helix-fastify/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"type": "tsc --noEmit"
},
"dependencies": {
"@envelop/core": "^5.0.1",
"@faker-js/faker": "^8.4.1",
"@envelop/core": "^5.0.2",
"@faker-js/faker": "^9.0.0",
"@pothos/core": "workspace:*",
"fastify": "^4.28.1",
"graphql": "^16.8.1",
Expand Down
12 changes: 6 additions & 6 deletions examples/federation/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@
"type": "tsc --noEmit"
},
"dependencies": {
"@apollo/gateway": "2.8.4",
"@apollo/server": "^4.10.5",
"@apollo/subgraph": "2.8.4",
"@faker-js/faker": "^8.4.1",
"@apollo/gateway": "2.9.0",
"@apollo/server": "^4.11.0",
"@apollo/subgraph": "2.9.0",
"@faker-js/faker": "^9.0.0",
"@pothos/core": "workspace:*",
"@pothos/plugin-directives": "workspace:*",
"@pothos/plugin-federation": "workspace:*",
"@prisma/client": "^5.17.0",
"@prisma/client": "^5.19.1",
"graphql": "^16.8.1",
"prisma": "^5.17.0"
"prisma": "^5.19.1"
},
"publishConfig": {
"access": "public"
Expand Down
4 changes: 2 additions & 2 deletions examples/graphql-shield/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
"type": "tsc --noEmit"
},
"dependencies": {
"@faker-js/faker": "^8.4.1",
"@faker-js/faker": "^9.0.0",
"@pothos/core": "workspace:*",
"graphql": "^16.8.1",
"graphql-middleware": "^6.1.35",
"graphql-shield": "^7.6.5",
"graphql-yoga": "5.6.2"
"graphql-yoga": "5.7.0"
},
"publishConfig": {
"access": "public"
Expand Down
2 changes: 1 addition & 1 deletion examples/helix/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"type": "tsc --noEmit"
},
"dependencies": {
"@faker-js/faker": "^8.4.1",
"@faker-js/faker": "^9.0.0",
"@pothos/core": "workspace:*",
"graphql": "^16.8.1",
"graphql-helix": "^1.13.0"
Expand Down
18 changes: 9 additions & 9 deletions examples/nextjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
"start": "next start"
},
"dependencies": {
"@apollo/client": "^3.11.2",
"@faker-js/faker": "^8.4.1",
"@apollo/client": "^3.11.8",
"@faker-js/faker": "^9.0.0",
"@pothos/core": "workspace:*",
"@tanstack/react-query": "^5.51.18",
"@tanstack/react-query": "^5.55.2",
"graphql": "^16.8.1",
"graphql-tag": "^2.12.6",
"graphql-yoga": "5.6.2",
"next": "14.2.5",
"graphql-yoga": "5.7.0",
"next": "14.2.8",
"react": "18.3.1",
"react-dom": "18.3.1"
},
Expand All @@ -27,11 +27,11 @@
"@graphql-codegen/schema-ast": "^4.1.0",
"@graphql-codegen/typescript": "^4.0.9",
"@graphql-codegen/typescript-operations": "^4.2.3",
"@graphql-codegen/typescript-react-apollo": "^4.3.0",
"@types/node": "22.0.2",
"@types/react": "18.3.3",
"@graphql-codegen/typescript-react-apollo": "^4.3.1",
"@types/node": "22.5.4",
"@types/react": "18.3.5",
"@types/react-dom": "18.3.0",
"concurrently": "^8.2.2",
"concurrently": "^9.0.0",
"typescript": "^5.5.4"
},
"engines": {
Expand Down
12 changes: 6 additions & 6 deletions examples/open-telemetry/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
"license": "MIT",
"dependencies": {
"@opentelemetry/api": "^1.9.0",
"@opentelemetry/exporter-zipkin": "^1.25.1",
"@opentelemetry/instrumentation": "^0.52.1",
"@opentelemetry/instrumentation-http": "^0.52.1",
"@opentelemetry/sdk-trace-base": "^1.25.1",
"@opentelemetry/sdk-trace-node": "^1.25.1",
"@opentelemetry/exporter-zipkin": "^1.26.0",
"@opentelemetry/instrumentation": "^0.53.0",
"@opentelemetry/instrumentation-http": "^0.53.0",
"@opentelemetry/sdk-trace-base": "^1.26.0",
"@opentelemetry/sdk-trace-node": "^1.26.0",
"@pothos/core": "workspace:*",
"@pothos/plugin-tracing": "workspace:*",
"@pothos/tracing-opentelemetry": "workspace:*",
"bema": "^0.1.2",
"graphql": "^16.8.1",
"graphql-yoga": "5.6.2",
"graphql-yoga": "5.7.0",
"tsm": "^2.3.0"
},
"publishConfig": {
Expand Down
12 changes: 6 additions & 6 deletions examples/prisma-federation/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@
"seed": "node -r @swc-node/register prisma/seed.ts"
},
"dependencies": {
"@apollo/gateway": "2.8.4",
"@apollo/server": "^4.10.5",
"@apollo/subgraph": "2.8.4",
"@faker-js/faker": "^8.4.1",
"@apollo/gateway": "2.9.0",
"@apollo/server": "^4.11.0",
"@apollo/subgraph": "2.9.0",
"@faker-js/faker": "^9.0.0",
"@pothos/core": "workspace:*",
"@pothos/plugin-directives": "workspace:*",
"@pothos/plugin-federation": "workspace:*",
"@pothos/plugin-prisma": "workspace:*",
"@pothos/plugin-relay": "workspace:*",
"@prisma/client": "^5.17.0",
"@prisma/client": "^5.19.1",
"graphql": "^16.8.1",
"prisma": "^5.17.0"
"prisma": "^5.19.1"
},
"publishConfig": {
"access": "public"
Expand Down
8 changes: 4 additions & 4 deletions examples/prisma-relay/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
"seed": "node -r @swc-node/register prisma/seed.ts"
},
"dependencies": {
"@faker-js/faker": "^8.4.1",
"@faker-js/faker": "^9.0.0",
"@pothos/core": "workspace:*",
"@pothos/plugin-prisma": "workspace:*",
"@pothos/plugin-relay": "workspace:*",
"@prisma/client": "^5.17.0",
"@prisma/client": "^5.19.1",
"graphql": "^16.8.1",
"graphql-yoga": "5.6.2",
"prisma": "^5.17.0"
"graphql-yoga": "5.7.0",
"prisma": "^5.19.1"
},
"publishConfig": {
"access": "public"
Expand Down
8 changes: 4 additions & 4 deletions examples/prisma-smart-subscriptions-apollo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@
"seed": "node -r @swc-node/register prisma/seed.ts"
},
"dependencies": {
"@apollo/server": "^4.10.5",
"@faker-js/faker": "^8.4.1",
"@apollo/server": "^4.11.0",
"@faker-js/faker": "^9.0.0",
"@pothos/core": "workspace:*",
"@pothos/plugin-prisma": "workspace:*",
"@pothos/plugin-smart-subscriptions": "workspace:*",
"@prisma/client": "^5.17.0",
"@prisma/client": "^5.19.1",
"body-parser": "^1.20.2",
"cors": "^2.8.5",
"express": "^4.19.2",
"graphql": "^16.8.1",
"graphql-subscriptions": "^2.0.0",
"graphql-ws": "^5.16.0",
"prisma": "^5.17.0",
"prisma": "^5.19.1",
"ws": "^8.18.0"
},
"publishConfig": {
Expand Down
8 changes: 4 additions & 4 deletions examples/prisma-subscriptions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
"seed": "node -r @swc-node/register prisma/seed.ts"
},
"dependencies": {
"@faker-js/faker": "^8.4.1",
"@faker-js/faker": "^9.0.0",
"@pothos/core": "workspace:*",
"@pothos/plugin-prisma": "workspace:*",
"@prisma/client": "^5.17.0",
"@prisma/client": "^5.19.1",
"graphql": "^16.8.1",
"graphql-subscriptions": "^2.0.0",
"graphql-yoga": "5.6.2",
"prisma": "^5.17.0"
"graphql-yoga": "5.7.0",
"prisma": "^5.19.1"
},
"publishConfig": {
"access": "public"
Expand Down
8 changes: 4 additions & 4 deletions examples/prisma/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
"seed": "node -r @swc-node/register prisma/seed.ts"
},
"dependencies": {
"@faker-js/faker": "^8.4.1",
"@faker-js/faker": "^9.0.0",
"@pothos/core": "workspace:*",
"@pothos/plugin-prisma": "workspace:*",
"@prisma/client": "^5.17.0",
"@prisma/client": "^5.19.1",
"graphql": "^16.8.1",
"graphql-yoga": "5.6.2",
"prisma": "^5.17.0"
"graphql-yoga": "5.7.0",
"prisma": "^5.19.1"
},
"publishConfig": {
"access": "public"
Expand Down
6 changes: 3 additions & 3 deletions examples/relay-windowed-pagination/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
"seed": "node -r @swc-node/register prisma/seed.ts"
},
"dependencies": {
"@faker-js/faker": "^8.4.1",
"@faker-js/faker": "^9.0.0",
"@pothos/core": "workspace:*",
"@pothos/plugin-relay": "workspace:*",
"graphql": "^16.8.1",
"graphql-yoga": "5.6.2",
"prisma": "^5.17.0"
"graphql-yoga": "5.7.0",
"prisma": "^5.19.1"
},
"publishConfig": {
"access": "public"
Expand Down
4 changes: 2 additions & 2 deletions examples/simple-classes/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
"type": "tsc --noEmit"
},
"dependencies": {
"@faker-js/faker": "^8.4.1",
"@faker-js/faker": "^9.0.0",
"@pothos/core": "workspace:*",
"graphql": "^16.8.1",
"graphql-yoga": "5.6.2"
"graphql-yoga": "5.7.0"
},
"publishConfig": {
"access": "public"
Expand Down
4 changes: 2 additions & 2 deletions examples/simple-interfaces/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
"type": "tsc --noEmit"
},
"dependencies": {
"@faker-js/faker": "^8.4.1",
"@faker-js/faker": "^9.0.0",
"@pothos/core": "workspace:*",
"graphql": "^16.8.1",
"graphql-yoga": "5.6.2"
"graphql-yoga": "5.7.0"
},
"publishConfig": {
"access": "public"
Expand Down
15 changes: 8 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,23 +30,23 @@
"devDependencies": {
"@biomejs/biome": "^1.8.3",
"@changesets/cli": "^2.27.7",
"@faker-js/faker": "^8.4.1",
"@faker-js/faker": "^9.0.0",
"@swc-node/register": "^1.10.9",
"@swc/cli": "^0.4.0",
"@swc/core": "^1.7.4",
"@swc/core": "^1.7.24",
"@swc/jest": "^0.2.36",
"@types/jest": "^29.5.12",
"@types/node": "^22.0.2",
"@types/node": "^22.5.4",
"@vitest/coverage-c8": "^0.33.0",
"globals": "^15.9.0",
"graphql": "^16.8.1",
"graphql-helix": "^1.13.0",
"graphql-tag": "^2.12.6",
"jest": "^29.7.0",
"tsx": "^4.16.5",
"turbo": "^2.0.11",
"tsx": "^4.19.0",
"turbo": "^2.1.1",
"typescript": "5.5.4",
"typescript-json-schema": "^0.64.0",
"typescript-json-schema": "^0.65.1",
"vitest": "^2.0.5"
},
"engines": {
Expand Down Expand Up @@ -75,8 +75,9 @@
"graphql": "^16.5.0"
}
},

"patchedDependencies": {
"@changesets/assemble-release-plan@6.0.3": "patches/@changesets__assemble-release-plan@6.0.3.patch"
"@changesets/assemble-release-plan": "patches/@changesets__assemble-release-plan.patch"
}
}
}
2 changes: 1 addition & 1 deletion packages/converter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"devDependencies": {
"@pothos/core": "workspace:*",
"@pothos/test-utils": "workspace:*",
"@types/yargs": "^17.0.32"
"@types/yargs": "^17.0.33"
},
"gitHead": "9dfe52f1975f41a111e01bf96a20033a914e2acc"
}
2 changes: 1 addition & 1 deletion packages/converter/tsconfig.type.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"compilerOptions": {
"skipLibCheck": false
"skipLibCheck": true
},
"extends": "../../tsconfig.options.json",
"include": ["src/**/*", "tests/**/*"]
Expand Down
2 changes: 1 addition & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
},
"devDependencies": {
"@pothos/test-utils": "workspace:*",
"graphql": "^16.8.1",
"graphql": ">=16.6.0",
"graphql-scalars": "^1.23.0",
"graphql-tag": "^2.12.6"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/deno/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"devDependencies": {
"@swc-node/register": "^1.10.9",
"@swc/core": "^1.7.4",
"@swc/core": "^1.7.24",
"typescript": "^5.5.4"
},
"gitHead": "9dfe52f1975f41a111e01bf96a20033a914e2acc"
Expand Down
2 changes: 1 addition & 1 deletion packages/plugin-directives/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"graphql": ">=16.6.0"
},
"devDependencies": {
"@graphql-tools/utils": "^10.3.2",
"@graphql-tools/utils": "^10.5.4",
"@pothos/core": "workspace:*",
"@pothos/test-utils": "workspace:*",
"graphql": "^16.8.1",
Expand Down
Loading

0 comments on commit a6d105b

Please sign in to comment.