From 118be7223c23ebbdd14e719ea4de3100fdb9dad2 Mon Sep 17 00:00:00 2001
From: donutegg <123068288+donutegg@users.noreply.github.com>
Date: Sat, 12 Aug 2023 19:44:34 +0100
Subject: [PATCH 1/2] chore(deps): update dependency env-paths to v3
---
.buildkite/publish/docker-compose.yml | 2 +-
.buildkite/publish/publish.yml | 2 +-
.buildkite/test/run.sh | 4 +-
.github/renovate.json | 44 +-
.github/workflows/test-template.yml | 41 +-
README.md | 15 +-
docker/README.md | 21 +-
docker/docker-compose.arm64.yml | 11 +
docker/docker-compose.yml | 6 +-
.../plugins/fill-plugin/fillers/process.ts | 12 +-
package.json | 22 +-
packages/cli/README.md | 9 +-
packages/cli/package.json | 12 +-
packages/cli/src/Studio.ts | 17 +-
packages/client/README.md | 2 +-
packages/client/extension.d.ts | 1 -
packages/client/extension.js | 3 -
.../helpers/functional-test/run-tests.ts | 16 +-
packages/client/package.json | 36 +-
packages/client/scripts/default-index.d.ts | 53 +-
packages/client/scripts/default-index.js | 10 -
.../errors/client-version-error/test.ts | 2 +-
.../integration/errors/multi-schema/test.ts | 4 +-
.../integration/happy/distinct/test.ts | 18 +-
.../__snapshots__/test.ts.snap | 5074 +++++++----------
.../__snapshots__/test.ts.snap | 4620 ++++++---------
.../src/__tests__/types/distinct/test.ts | 8 -
.../client/src/generation/TSClient/Args.ts | 21 +-
.../client/src/generation/TSClient/Count.ts | 11 +-
.../client/src/generation/TSClient/Input.ts | 9 +-
.../client/src/generation/TSClient/Model.ts | 172 +-
.../client/src/generation/TSClient/Output.ts | 60 +-
.../client/src/generation/TSClient/Payload.ts | 117 +
.../src/generation/TSClient/PrismaClient.ts | 247 +-
.../src/generation/TSClient/SelectInclude.ts | 33 +-
.../client/src/generation/TSClient/common.ts | 51 +-
.../client/src/generation/TSClient/helpers.ts | 13 +-
.../generation/TSClient/utils/ifExtensions.ts | 9 +
.../src/generation/ts-builders/Export.ts | 11 -
.../src/generation/ts-builders/NamedType.ts | 8 +
.../src/generation/ts-builders/ObjectType.ts | 7 -
.../generation/ts-builders/PrimitiveType.ts | 1 -
.../src/generation/ts-builders/helpers.ts | 14 -
.../src/generation/ts-builders/index.ts | 1 -
packages/client/src/generation/utils.ts | 44 +-
.../src/generation/utils/buildDirname.ts | 5 +-
packages/client/src/runtime/DataLoader.ts | 4 -
packages/client/src/runtime/RequestHandler.ts | 113 +-
.../compositeProxy/createCompositeProxy.ts | 10 +-
.../core/compositeProxy/removeProperties.ts | 2 +-
.../core/engines/binary/BinaryEngine.ts | 2 +-
.../core/engines/common/types/JsonProtocol.ts | 2 +-
.../core/engines/library/LibraryEngine.ts | 2 +-
.../core/errorRendering/applyUnionError.ts | 143 -
.../applyValidationError.test.ts | 67 +-
.../errorRendering/applyValidationError.ts | 70 +-
.../errors/PrismaClientInitializationError.ts | 2 -
.../errors/PrismaClientKnownRequestError.ts | 3 +-
.../core/errors/PrismaClientRustPanicError.ts | 3 +-
.../src/runtime/core/extensions/$extends.ts | 77 +-
.../core/extensions/MergedExtensionsList.ts | 43 +-
.../core/extensions/applyQueryExtensions.ts | 74 +-
.../core/extensions/getExtensionContext.ts | 7 +-
.../src/runtime/core/model/applyModel.ts | 3 +-
.../model/applyModelsAndClientExtensions.ts | 2 +-
.../protocol/json/JsonProtocolEncoder.test.ts | 94 -
.../core/protocol/json/JsonProtocolEncoder.ts | 2 +-
.../core/protocol/json/serialize.test.ts | 3 +-
.../runtime/core/protocol/json/serialize.ts | 2 +-
.../client/src/runtime/core/public/index.ts | 9 -
.../src/runtime/core/public/validator.ts | 18 -
.../runtime/core/raw-query/RawQueryArgs.ts | 2 +-
.../core/raw-query/rawCommandArgsMapper.ts | 3 -
.../core/raw-query/rawQueryArgsMapper.ts | 172 +-
.../core/request/createPrismaPromise.ts | 85 +-
.../src/runtime/core/types/Extensions.ts | 231 +-
.../src/runtime/core/types/GetResult.ts | 119 +-
.../client/src/runtime/core/types/Payload.ts | 3 -
.../client/src/runtime/core/types/Public.ts | 2 +-
.../client/src/runtime/core/types/Utils.ts | 98 +-
.../client/src/runtime/core/types/index.ts | 7 +-
.../client/src/runtime/getPrismaClient.ts | 159 +-
packages/client/src/runtime/index-browser.ts | 4 -
packages/client/src/runtime/index.ts | 12 +-
.../client/src/runtime/itxClientDenyList.ts | 5 -
packages/client/src/runtime/query.ts | 2 +-
.../client/src/runtime/utils/deepCloneArgs.ts | 82 -
.../runtime/utils/mssqlPreparedStatement.ts | 6 +-
.../e2e/bundler-detection-error/tests/main.ts | 20 +
.../publish-extensions/_steps.ts | 7 +-
.../publish-extensions}/package.json | 2 +-
.../publish-extensions/prisma/schema.prisma | 0
.../publish-extensions/readme.md | 2 +-
.../simple-ext/package.json | 6 +-
.../simple-ext/src/index.ts | 2 +-
.../simple-ext/tsconfig.json | 0
.../publish-extensions/src/index.ts} | 12 +-
.../publish-extensions}/tsconfig.json | 0
.../tests/e2e/default-version/_steps.ts | 17 -
.../tests/e2e/default-version/package.json | 13 -
.../tests/e2e/default-version/pnpm-lock.yaml | 36 -
.../tests/e2e/default-version/readme.md | 3 -
.../tests/e2e/default-version/tests/main.ts | 6 -
.../tests/e2e/default-version/tsconfig.json | 4 -
.../readme.md | 2 +-
packages/client/tests/e2e/example/_steps.ts | 2 +-
.../client/tests/e2e/example/package.json | 1 -
.../tests/e2e/example/prisma/schema.prisma | 1 +
.../client/tests/e2e/example/tsconfig.json | 2 +-
.../19866-ts-composite-declaration/_steps.ts | 19 -
.../pnpm-lock.yaml | 55 -
.../prisma/schema.prisma | 35 -
.../19866-ts-composite-declaration/readme.md | 3 -
.../src/index.ts | 7 -
.../tsconfig.json | 9 -
.../issues/studio-1128-spawn-enoent/_steps.ts | 32 -
.../studio-1128-spawn-enoent/package.json | 10 -
.../prisma/schema.prisma | 13 -
.../issues/studio-1128-spawn-enoent/readme.md | 3 -
packages/client/tests/e2e/jest.config.js | 1 -
.../tests/vercel-auto-generate.ts | 2 +-
.../tests/e2e/publish-extensions/package.json | 15 -
.../e2e/publish-extensions/pnpm-lock.yaml | 386 --
.../simple-ext/pnpm-lock.yaml | 48 -
.../e2e/publish-extensions/tsconfig.json | 4 -
.../functional/_utils/setupFilesAfterEnv.ts | 15 +-
.../functional/_utils/setupTestSuiteEnv.ts | 2 +-
.../functional/_utils/setupTestSuiteMatrix.ts | 14 -
.../client/tests/functional/batching/tests.ts | 11 -
.../tests/functional/blog-update/tests.ts | 8 +-
.../composites/selection/_matrix.ts | 9 -
.../composites/selection/prisma/_schema.ts | 36 -
.../functional/composites/selection/tests.ts | 109 -
.../functional/decimal/precision/tests.ts | 2 -
.../functional/default-selection/_matrix.ts | 2 -
.../default-selection/prisma/_schema.ts | 3 +-
.../extensions/__snapshots__/itx.ts.snap | 121 -
.../tests/functional/extensions/_matrix.ts | 24 -
.../functional/extensions/defineExtension.ts | 667 ---
.../disabled}/_matrix.ts | 0
.../disabled}/prisma/_schema.ts | 2 -
.../functional/extensions/disabled/tests.ts | 16 +
.../enabled/__snapshots__/itx.ts.snap | 121 +
.../{ => enabled}/__snapshots__/tx.ts.snap | 36 +-
.../enabled}/_matrix.ts | 0
.../extensions/{ => enabled}/client.ts | 102 +-
.../extensions/enabled/defineExtension.ts | 400 ++
.../extensions/{ => enabled}/extends.ts | 5 -
.../extensions/{ => enabled}/itx.ts | 131 +-
.../extensions/{ => enabled}/model.ts | 30 +-
.../{ => enabled}/prisma/_schema.ts | 2 +-
.../{pdp.ts => enabled/query-accelerate.ts} | 130 +-
.../extensions/{ => enabled}/query.ts | 187 +-
.../extensions/{ => enabled}/result.ts | 33 +-
.../functional/extensions/{ => enabled}/tx.ts | 28 -
.../filter-count-relations/prisma/_schema.ts | 1 +
.../11740-transaction-stored-query/tests.ts | 4 +-
.../tests.ts | 6 +-
.../tests/functional/issues/15044/tests.ts | 4 +-
.../tests/functional/issues/15176/tests.ts | 2 +-
.../15644-middleware-arg-types/_matrix.ts | 3 -
.../15644-middleware-arg-types/tests.ts | 60 +-
.../17405-extensions-casing/prisma/_schema.ts | 20 -
.../issues/17405-extensions-casing/tests.ts | 24 -
.../prisma/_schema.ts | 21 -
.../17948-tx-client-extensions/tests.ts | 38 -
.../issues/18276-batch-order/_matrix.ts | 21 -
.../18276-batch-order/prisma/_schema.ts | 20 -
.../issues/18276-batch-order/tests.ts | 77 -
.../18854-extensions-db-null/_matrix.ts | 15 -
.../issues/18854-extensions-db-null/tests.ts | 33 -
.../client/tests/functional/logging/tests.ts | 6 +-
.../functional/methods/create-many/tests.ts | 14 +-
.../methods/upsert/native-atomic/tests.ts | 14 +-
.../functional/methods/upsert/simple/tests.ts | 4 +-
.../functional/middleware-raw-args/_matrix.ts | 21 -
.../middleware-raw-args/prisma/_schema.ts | 20 -
.../functional/middleware-raw-args/tests.ts | 66 -
.../tests/functional/multi-schema/tests.ts | 4 +-
.../order-by-null/prisma/_schema.ts | 1 +
.../query-validation/prisma/_schema.ts | 21 +-
.../functional/query-validation/tests.ts | 465 +-
.../tests_m-to-n-MongoDB.ts | 2 +-
.../tests.ts | 2 +-
.../tests/functional/validator/_matrix.ts | 9 -
.../functional/validator/prisma/_schema.ts | 19 -
.../tests/functional/validator/tests.ts | 180 -
.../client/tests/functional/views/tests.ts | 8 +-
packages/debug/package.json | 4 +-
packages/engines/README.md | 2 +-
packages/engines/package.json | 8 +-
packages/engines/src/index.ts | 2 -
packages/fetch-engine/package.json | 12 +-
.../src/__tests__/binaryTarget/.gitkeep | 0
.../src/__tests__/checksum/.gitkeep | 0
.../src/__tests__/download.test.ts | 1193 ++--
packages/fetch-engine/src/download.ts | 16 +-
packages/fetch-engine/src/downloadZip.ts | 65 +-
packages/fetch-engine/src/getProxyAgent.ts | 12 +-
packages/generator-helper/package.json | 6 +-
packages/get-platform/package.json | 6 +-
.../src/__tests__/getPlatform.test.ts | 2 +-
packages/get-platform/src/getPlatform.ts | 2 +-
packages/get-platform/src/platforms.ts | 4 -
packages/instrumentation/README.md | 2 +-
packages/instrumentation/package.json | 6 +-
packages/integration-tests/package.json | 12 +-
.../integration/sqlite/__database.ts | 2 +-
packages/internals/package.json | 10 +-
.../__snapshots__/getDmmf.test.ts.snap | 460 +-
.../auto-installation/getPackageCmd.ts | 2 +-
.../auto-installation/runPackageCmd.ts | 2 +-
.../check-dependencies/isYarnUsed.ts | 2 +-
.../prisma-client-js/prismaClientResolver.ts | 6 +-
packages/internals/src/index.ts | 2 +-
packages/internals/src/utils/max.test.ts | 23 -
packages/internals/src/utils/max.ts | 28 -
packages/internals/src/utils/maxBy.test.ts | 10 +
packages/internals/src/utils/maxBy.ts | 16 +
packages/migrate/README.md | 2 -
packages/migrate/package.json | 15 +-
.../src/utils/getSchemaPathAndPrint.ts | 2 +-
.../package.json | 2 +-
packages/ni/.gitignore | 85 +
packages/ni/LICENSE | 21 +
packages/ni/README.md | 5 +
packages/ni/helpers/build.ts | 10 +
packages/ni/package.json | 53 +
packages/ni/src/agents.ts | 102 +
packages/ni/src/commands/index.ts | 1 +
packages/ni/src/commands/na.ts | 4 +
packages/ni/src/commands/nci.ts | 7 +
packages/ni/src/commands/ni.ts | 4 +
packages/ni/src/commands/nlx.ts | 4 +
packages/ni/src/commands/nr.ts | 95 +
packages/ni/src/commands/nu.ts | 4 +
packages/ni/src/commands/nun.ts | 4 +
packages/ni/src/config.ts | 57 +
packages/ni/src/detect.ts | 75 +
packages/ni/src/fs.ts | 24 +
packages/ni/src/index.ts | 6 +
packages/ni/src/parse.ts | 84 +
packages/ni/src/runner.ts | 109 +
packages/ni/src/storage.ts | 31 +
packages/ni/src/utils.ts | 91 +
packages/ni/tsconfig.build.json | 7 +
packages/ni/tsconfig.json | 3 +
packages/react-prisma/package.json | 10 +-
...ch@2.6.11.patch => node-fetch@2.6.7.patch} | 10 +-
pnpm-lock.yaml | 3791 ++++++++----
scripts/ci/publish.ts | 4 +-
tsconfig.build.bundle.json | 1 +
252 files changed, 10144 insertions(+), 13375 deletions(-)
create mode 100644 docker/docker-compose.arm64.yml
delete mode 100644 packages/client/extension.d.ts
delete mode 100644 packages/client/extension.js
create mode 100644 packages/client/src/generation/TSClient/Payload.ts
create mode 100644 packages/client/src/generation/TSClient/utils/ifExtensions.ts
delete mode 100644 packages/client/src/generation/ts-builders/helpers.ts
delete mode 100644 packages/client/src/runtime/core/errorRendering/applyUnionError.ts
delete mode 100644 packages/client/src/runtime/core/protocol/json/JsonProtocolEncoder.test.ts
delete mode 100644 packages/client/src/runtime/core/public/index.ts
delete mode 100644 packages/client/src/runtime/core/public/validator.ts
delete mode 100644 packages/client/src/runtime/core/raw-query/rawCommandArgsMapper.ts
delete mode 100644 packages/client/src/runtime/itxClientDenyList.ts
delete mode 100644 packages/client/src/runtime/utils/deepCloneArgs.ts
rename packages/client/tests/e2e/{ => community}/publish-extensions/_steps.ts (75%)
rename packages/client/tests/e2e/{issues/19866-ts-composite-declaration => community/publish-extensions}/package.json (82%)
rename packages/client/tests/e2e/{ => community}/publish-extensions/prisma/schema.prisma (100%)
rename packages/client/tests/e2e/{ => community}/publish-extensions/readme.md (68%)
rename packages/client/tests/e2e/{ => community}/publish-extensions/simple-ext/package.json (59%)
rename packages/client/tests/e2e/{ => community}/publish-extensions/simple-ext/src/index.ts (80%)
rename packages/client/tests/e2e/{ => community}/publish-extensions/simple-ext/tsconfig.json (100%)
rename packages/client/tests/e2e/{publish-extensions/tests/main.ts => community/publish-extensions/src/index.ts} (52%)
rename packages/client/tests/e2e/{issues/studio-1128-spawn-enoent => community/publish-extensions}/tsconfig.json (100%)
delete mode 100644 packages/client/tests/e2e/default-version/_steps.ts
delete mode 100644 packages/client/tests/e2e/default-version/package.json
delete mode 100644 packages/client/tests/e2e/default-version/pnpm-lock.yaml
delete mode 100644 packages/client/tests/e2e/default-version/readme.md
delete mode 100644 packages/client/tests/e2e/default-version/tests/main.ts
delete mode 100644 packages/client/tests/e2e/default-version/tsconfig.json
delete mode 100644 packages/client/tests/e2e/issues/19866-ts-composite-declaration/_steps.ts
delete mode 100644 packages/client/tests/e2e/issues/19866-ts-composite-declaration/pnpm-lock.yaml
delete mode 100644 packages/client/tests/e2e/issues/19866-ts-composite-declaration/prisma/schema.prisma
delete mode 100644 packages/client/tests/e2e/issues/19866-ts-composite-declaration/readme.md
delete mode 100644 packages/client/tests/e2e/issues/19866-ts-composite-declaration/src/index.ts
delete mode 100644 packages/client/tests/e2e/issues/19866-ts-composite-declaration/tsconfig.json
delete mode 100644 packages/client/tests/e2e/issues/studio-1128-spawn-enoent/_steps.ts
delete mode 100644 packages/client/tests/e2e/issues/studio-1128-spawn-enoent/package.json
delete mode 100644 packages/client/tests/e2e/issues/studio-1128-spawn-enoent/prisma/schema.prisma
delete mode 100644 packages/client/tests/e2e/issues/studio-1128-spawn-enoent/readme.md
delete mode 100644 packages/client/tests/e2e/publish-extensions/package.json
delete mode 100644 packages/client/tests/e2e/publish-extensions/pnpm-lock.yaml
delete mode 100644 packages/client/tests/e2e/publish-extensions/simple-ext/pnpm-lock.yaml
delete mode 100644 packages/client/tests/e2e/publish-extensions/tsconfig.json
delete mode 100644 packages/client/tests/functional/composites/selection/_matrix.ts
delete mode 100644 packages/client/tests/functional/composites/selection/prisma/_schema.ts
delete mode 100644 packages/client/tests/functional/composites/selection/tests.ts
delete mode 100644 packages/client/tests/functional/extensions/__snapshots__/itx.ts.snap
delete mode 100644 packages/client/tests/functional/extensions/_matrix.ts
delete mode 100644 packages/client/tests/functional/extensions/defineExtension.ts
rename packages/client/tests/functional/{issues/17405-extensions-casing => extensions/disabled}/_matrix.ts (100%)
rename packages/client/tests/functional/{issues/18854-extensions-db-null => extensions/disabled}/prisma/_schema.ts (87%)
create mode 100644 packages/client/tests/functional/extensions/disabled/tests.ts
create mode 100644 packages/client/tests/functional/extensions/enabled/__snapshots__/itx.ts.snap
rename packages/client/tests/functional/extensions/{ => enabled}/__snapshots__/tx.ts.snap (52%)
rename packages/client/tests/functional/{issues/17948-tx-client-extensions => extensions/enabled}/_matrix.ts (100%)
rename packages/client/tests/functional/extensions/{ => enabled}/client.ts (66%)
create mode 100644 packages/client/tests/functional/extensions/enabled/defineExtension.ts
rename packages/client/tests/functional/extensions/{ => enabled}/extends.ts (82%)
rename packages/client/tests/functional/extensions/{ => enabled}/itx.ts (57%)
rename packages/client/tests/functional/extensions/{ => enabled}/model.ts (96%)
rename packages/client/tests/functional/extensions/{ => enabled}/prisma/_schema.ts (88%)
rename packages/client/tests/functional/extensions/{pdp.ts => enabled/query-accelerate.ts} (50%)
rename packages/client/tests/functional/extensions/{ => enabled}/query.ts (82%)
rename packages/client/tests/functional/extensions/{ => enabled}/result.ts (83%)
rename packages/client/tests/functional/extensions/{ => enabled}/tx.ts (83%)
delete mode 100644 packages/client/tests/functional/issues/17405-extensions-casing/prisma/_schema.ts
delete mode 100644 packages/client/tests/functional/issues/17405-extensions-casing/tests.ts
delete mode 100644 packages/client/tests/functional/issues/17948-tx-client-extensions/prisma/_schema.ts
delete mode 100644 packages/client/tests/functional/issues/17948-tx-client-extensions/tests.ts
delete mode 100644 packages/client/tests/functional/issues/18276-batch-order/_matrix.ts
delete mode 100644 packages/client/tests/functional/issues/18276-batch-order/prisma/_schema.ts
delete mode 100644 packages/client/tests/functional/issues/18276-batch-order/tests.ts
delete mode 100644 packages/client/tests/functional/issues/18854-extensions-db-null/_matrix.ts
delete mode 100644 packages/client/tests/functional/issues/18854-extensions-db-null/tests.ts
delete mode 100644 packages/client/tests/functional/middleware-raw-args/_matrix.ts
delete mode 100644 packages/client/tests/functional/middleware-raw-args/prisma/_schema.ts
delete mode 100644 packages/client/tests/functional/middleware-raw-args/tests.ts
delete mode 100644 packages/client/tests/functional/validator/_matrix.ts
delete mode 100644 packages/client/tests/functional/validator/prisma/_schema.ts
delete mode 100644 packages/client/tests/functional/validator/tests.ts
delete mode 100644 packages/fetch-engine/src/__tests__/binaryTarget/.gitkeep
delete mode 100644 packages/fetch-engine/src/__tests__/checksum/.gitkeep
delete mode 100644 packages/internals/src/utils/max.test.ts
delete mode 100644 packages/internals/src/utils/max.ts
create mode 100644 packages/internals/src/utils/maxBy.test.ts
create mode 100644 packages/internals/src/utils/maxBy.ts
create mode 100644 packages/ni/.gitignore
create mode 100644 packages/ni/LICENSE
create mode 100644 packages/ni/README.md
create mode 100644 packages/ni/helpers/build.ts
create mode 100644 packages/ni/package.json
create mode 100644 packages/ni/src/agents.ts
create mode 100644 packages/ni/src/commands/index.ts
create mode 100644 packages/ni/src/commands/na.ts
create mode 100644 packages/ni/src/commands/nci.ts
create mode 100644 packages/ni/src/commands/ni.ts
create mode 100644 packages/ni/src/commands/nlx.ts
create mode 100644 packages/ni/src/commands/nr.ts
create mode 100644 packages/ni/src/commands/nu.ts
create mode 100644 packages/ni/src/commands/nun.ts
create mode 100644 packages/ni/src/config.ts
create mode 100644 packages/ni/src/detect.ts
create mode 100644 packages/ni/src/fs.ts
create mode 100644 packages/ni/src/index.ts
create mode 100644 packages/ni/src/parse.ts
create mode 100644 packages/ni/src/runner.ts
create mode 100644 packages/ni/src/storage.ts
create mode 100644 packages/ni/src/utils.ts
create mode 100644 packages/ni/tsconfig.build.json
create mode 100644 packages/ni/tsconfig.json
rename patches/{node-fetch@2.6.11.patch => node-fetch@2.6.7.patch} (89%)
diff --git a/.buildkite/publish/docker-compose.yml b/.buildkite/publish/docker-compose.yml
index e5d1b7f539b8..b8c0a645512e 100644
--- a/.buildkite/publish/docker-compose.yml
+++ b/.buildkite/publish/docker-compose.yml
@@ -132,7 +132,7 @@ services:
- '3307:3306'
vitess-8:
- image: vitess/vttestserver:mysql80@sha256:d7486215316e352aecc6f34d4a3024017d79377e2a09545a7990b6aa4ea8d6a2
+ image: vitess/vttestserver:mysql80@sha256:4b7776e90f6315b104e9f0d579ef3a27b269081ebcf4053d184f2e855c7a63ed
restart: unless-stopped
ports:
- 33807:33807
diff --git a/.buildkite/publish/publish.yml b/.buildkite/publish/publish.yml
index 802650aa7c7d..16cbba789bec 100644
--- a/.buildkite/publish/publish.yml
+++ b/.buildkite/publish/publish.yml
@@ -2,7 +2,7 @@ steps:
- label: ':llama: Publish'
timeout_in_minutes: 45
plugins:
- - docker-compose#v4.13.0:
+ - docker-compose#v4.12.0:
config: .buildkite/publish/docker-compose.yml
run: app
- wait
diff --git a/.buildkite/test/run.sh b/.buildkite/test/run.sh
index c588fa246e4f..022f2a03957d 100755
--- a/.buildkite/test/run.sh
+++ b/.buildkite/test/run.sh
@@ -48,10 +48,10 @@ pnpm run setup
echo "~~~ @prisma/client test:functional"
echo "Start testing..."
-pnpm run --filter "@prisma/client" test:functional --silent
+pnpm run --filter "@prisma/client" test:functional
echo "~~~ Test all packages"
-pnpm run test
+pnpm run test
echo "~~~ @prisma/client test:memory"
# Client memory test suite Note: we run it last as DB is not isolated and will
diff --git a/.github/renovate.json b/.github/renovate.json
index 470ddc6b8c7a..8b2b6e714d94 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -39,46 +39,6 @@
"excludePackageNames": ["checkpoint-client"],
"schedule": ["before 7am on Wednesday"]
},
- {
- "groupName": "ESM devDependencies & dependencies (patch & minor)",
- "depTypeList": ["dependencies", "devDependencies"],
- "updateTypes": ["patch", "minor"],
- "matchPackageNames": [
- "get-port",
- "is-obj",
- "is-regexp",
- "mongo",
- "p-reduce",
- "postgres",
- "sort-keys",
- "node.js",
- "@sindresorhus/slugify",
- "cli-truncate",
- "escape-string-regexp",
- "execa",
- "find-up",
- "get-stdin",
- "globby",
- "has-yarn",
- "indent-string",
- "log-update",
- "new-github-issue-url",
- "node-fetch",
- "ora",
- "p-map",
- "p-retry",
- "pkg-up",
- "read-pkg-up",
- "replace-string",
- "string-width",
- "strip-ansi",
- "strip-indent",
- "temp-write",
- "tempy",
- "terminal-link"
- ],
- "schedule": ["before 7am on Wednesday"]
- },
{
"groupName": "ESM devDependencies & dependencies (major)",
"depTypeList": ["dependencies", "devDependencies"],
@@ -150,8 +110,8 @@
"schedule": ["before 7am on Wednesday"]
},
{
- "groupName": "npm-packlist",
- "packageNames": ["npm-packlist"],
+ "groupName": "sqlite-async",
+ "packageNames": ["sqlite-async"],
"schedule": ["before 7am on Wednesday"]
},
{
diff --git a/.github/workflows/test-template.yml b/.github/workflows/test-template.yml
index d3ab547d6ae7..a50f4f6e1a4a 100644
--- a/.github/workflows/test-template.yml
+++ b/.github/workflows/test-template.yml
@@ -35,7 +35,7 @@ on:
required: false
BUILDPULSE_SECRET_ACCESS_KEY:
required: false
- # Docker Hub credentials must be passed to avoid rate limiting when using Buildjet runners
+ # Docker Hub credentials must be passed to avoid rate limiting
# But they are not required, so forks can run the workflow without defining them
DOCKERHUB_USERNAME:
required: false
@@ -157,8 +157,7 @@ jobs:
env:
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
- # Login to Docker Hub is only needed for buildjet runners
- if: "${{ startsWith(inputs.ubuntuRunner, 'buildjet') && env.DOCKERHUB_USERNAME != '' && env.DOCKERHUB_TOKEN != '' }}"
+ if: "${{ env.DOCKERHUB_USERNAME != '' && env.DOCKERHUB_TOKEN != '' }}"
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -175,7 +174,7 @@ jobs:
run: |
echo "PRISMA_ENGINE_PROTOCOL=${{ matrix.engineProtocol }}" >> $GITHUB_ENV
- - run: docker compose -f docker/docker-compose.yml up --detach postgres postgres_isolated mysql mysql_isolated mssql mongo cockroachdb vitess-8
+ - run: docker-compose -f docker/docker-compose.yml up --detach postgres postgres_isolated mysql mysql_isolated mssql mongo cockroachdb vitess-8
- uses: pnpm/action-setup@v2.2.4
with:
@@ -189,11 +188,11 @@ jobs:
- run: bash .github/workflows/scripts/setup.sh
# Run the functional test suite
- - run: pnpm run test:functional --silent --shard ${{ matrix.shard }}
+ - run: pnpm run test:functional --shard ${{ matrix.shard }}
if: ${{ contains(inputs.jobsToRun, '-all-') || contains(inputs.jobsToRun, '-client-') }}
working-directory: packages/client
# And run all the other tests (except the types tests)
- - run: pnpm run test-notypes --silent --shard ${{ matrix.shard }}
+ - run: pnpm run test-notypes --shard ${{ matrix.shard }}
if: ${{ contains(inputs.jobsToRun, '-all-') || contains(inputs.jobsToRun, '-client-') }}
working-directory: packages/client
@@ -252,7 +251,7 @@ jobs:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- - run: docker compose -f docker/docker-compose.yml up --detach postgres mysql mssql mongo cockroachdb vitess-8
+ - run: docker-compose -f docker/docker-compose.yml up --detach postgres mysql mssql mongo cockroachdb vitess-8
- uses: pnpm/action-setup@v2.2.4
with:
@@ -269,7 +268,7 @@ jobs:
SKIP_GIT: true
GITHUB_CONTEXT: ${{ toJson(github) }}
- - run: pnpm run test:functional --silent --data-proxy --shard ${{ matrix.shard }}
+ - run: pnpm run test:functional --data-proxy --shard ${{ matrix.shard }}
working-directory: packages/client
env:
CI: true
@@ -286,7 +285,7 @@ jobs:
JEST_JUNIT_UNIQUE_OUTPUT_NAME: true
PRISMA_ENGINE_PROTOCOL: '${{ matrix.engineProtocol }}'
- - run: pnpm run test:functional --silent --data-proxy --edge-client --shard ${{ matrix.shard }}
+ - run: pnpm run test:functional --data-proxy --edge-client --shard ${{ matrix.shard }}
working-directory: packages/client
env:
CI: true
@@ -355,7 +354,7 @@ jobs:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- - run: docker compose -f docker/docker-compose.yml up --detach postgres # mysql mysql_isolated mssql mongo cockroachdb
+ - run: docker-compose -f docker/docker-compose.yml up --detach postgres # mysql mysql_isolated mssql mongo cockroachdb
- uses: pnpm/action-setup@v2.2.4
with:
@@ -462,7 +461,7 @@ jobs:
- uses: actions/checkout@v3
# Not currently needed, but we might need it in the future
- - run: docker compose -f docker/docker-compose.yml up --detach postgres mysql mssql mongo cockroachdb vitess-8
+ - run: docker-compose -f docker/docker-compose.yml up --detach postgres mysql mssql mongo cockroachdb vitess-8
- uses: pnpm/action-setup@v2.2.4
with:
@@ -535,7 +534,7 @@ jobs:
echo "RELATION_MODE=${{ matrix.relationMode }}"
if [ ! -z "${{ matrix.relationMode }}" ]; then echo "RELATION_MODE=${{ matrix.relationMode }}" >> $GITHUB_ENV; fi
- - run: docker compose -f docker/docker-compose.yml up --detach postgres mysql mssql mongo cockroachdb vitess-8
+ - run: docker-compose -f docker/docker-compose.yml up --detach postgres mysql mssql mongo cockroachdb vitess-8
- uses: pnpm/action-setup@v2.2.4
with:
@@ -554,21 +553,21 @@ jobs:
# shouldn't take more than 15 minutes
- name: 1 to 1
- run: pnpm run test:functional:code --silent --relation-mode-tests-only relationMode-in-separate-gh-action/tests_1-to-1.ts
+ run: pnpm run test:functional:code --relation-mode-tests-only relationMode-in-separate-gh-action/tests_1-to-1.ts
working-directory: packages/client
# shouldn't take more than 15 minutes
- name: 1 to n
- run: pnpm run test:functional:code --silent --relation-mode-tests-only relationMode-in-separate-gh-action/tests_1-to-n.ts
+ run: pnpm run test:functional:code --relation-mode-tests-only relationMode-in-separate-gh-action/tests_1-to-n.ts
working-directory: packages/client
# shouldn't take more than 15 minutes
- name: m to n (SQL databases)
- run: pnpm run test:functional:code --silent --relation-mode-tests-only relationMode-in-separate-gh-action/tests_m-to-n.ts
+ run: pnpm run test:functional:code --relation-mode-tests-only relationMode-in-separate-gh-action/tests_m-to-n.ts
working-directory: packages/client
- name: m to n (MongoDB)
- run: pnpm run test:functional:code --silent --relation-mode-tests-only relationMode-in-separate-gh-action/tests_m-to-n-MongoDB.ts
+ run: pnpm run test:functional:code --relation-mode-tests-only relationMode-in-separate-gh-action/tests_m-to-n-MongoDB.ts
working-directory: packages/client
- name: Upload test results to BuildPulse for flaky test detection
@@ -672,7 +671,7 @@ jobs:
run: |
echo "PRISMA_CLIENT_ENGINE_TYPE=${{ matrix.queryEngine }}" >> $GITHUB_ENV
- - run: docker compose -f docker/docker-compose.yml up --detach postgres mysql mariadb mssql
+ - run: docker-compose -f docker/docker-compose.yml up --detach postgres mysql mariadb mssql
- uses: pnpm/action-setup@v2.2.4
with:
@@ -739,7 +738,7 @@ jobs:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- - run: docker compose -f docker/docker-compose.yml up --detach postgres mysql mssql
+ - run: docker-compose -f docker/docker-compose.yml up --detach postgres mysql mssql
- name: Set CLI Engine Type
run: |
@@ -811,7 +810,7 @@ jobs:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- - run: docker compose -f docker/docker-compose.yml up --detach postgres mysql mssql mongodb_migrate mongodb_migrate_seed cockroachdb
+ - run: docker-compose -f docker/docker-compose.yml up --detach postgres mysql mssql mongodb_migrate mongodb_migrate_seed cockroachdb
- name: Set CLI Engine Type
run: |
@@ -1106,7 +1105,7 @@ jobs:
GITHUB_CONTEXT: ${{ toJson(github) }}
- name: Test packages/client
- run: pnpm run test:functional:code --silent --shard ${{matrix.shard}}
+ run: pnpm run test:functional:code --shard ${{matrix.shard}}
working-directory: packages/client
env:
CI: true
@@ -1217,7 +1216,7 @@ jobs:
- name: Test packages/client (old suite)
if: ${{ contains(inputs.jobsToRun, '-all-') || contains(inputs.jobsToRun, '-client-') }}
- run: pnpm run test-notypes --silent --testTimeout=40000
+ run: pnpm run test-notypes --testTimeout=40000
working-directory: packages/client
env:
CI: true
diff --git a/README.md b/README.md
index d4d151f15aed..28174ee0361a 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,6 @@
-
Quickstart
@@ -21,9 +20,9 @@
•
Slack
•
- Discord
- •
Twitter
+ •
+ Prisma 1
, + Args extends runtime.Types.Extensions.Args = runtime.Types.Extensions.InternalArgs, >( args: | ((client: PrismaClientExtends ) => { $extends: { extArgs: Args } }) - | { name?: string } - | { result?: R & runtime.Types.Extensions.UserArgs['result'] } - | { model?: M & runtime.Types.Extensions.UserArgs['model'] } - | { query?: Q & runtime.Types.Extensions.UserArgs['query'] } - | { client?: C & runtime.Types.Extensions.UserArgs['client'] }, - ) => PrismaClientExtends & Args['client']) - - $transaction ( - fn: (prisma: Omit ) => Promise , - options?: { maxWait?: number; timeout?: number; isolationLevel?: string }, - ): Promise - $transaction []>( - arg: [...P], - options?: { isolationLevel?: string }, - ): Promise
> + | { name?: string; result?: R; model?: M; query?: Q; client?: C }, + ) => PrismaClientExtends ) } export declare const dmmf: any @@ -80,31 +65,23 @@ export namespace Prisma { export type TransactionClient = any export function defineExtension< - Q extends runtime.Types.Extensions.UserArgs['query'] = {}, R extends runtime.Types.Extensions.UserArgs['result'] = {}, M extends runtime.Types.Extensions.UserArgs['model'] = {}, + Q extends runtime.Types.Extensions.UserArgs['query'] = {}, C extends runtime.Types.Extensions.UserArgs['client'] = {}, - Args extends runtime.Types.Extensions.Args = runtime.Types.Extensions.InternalArgs , + Args extends runtime.Types.Extensions.Args = runtime.Types.Extensions.InternalArgs, >( args: | ((client: PrismaClientExtends) => { $extends: { extArgs: Args } }) - | { name?: string } - | { result?: R & runtime.Types.Extensions.UserArgs['result'] } - | { model?: M & runtime.Types.Extensions.UserArgs['model'] } - | { query?: Q & runtime.Types.Extensions.UserArgs['query'] } - | { client?: C & runtime.Types.Extensions.UserArgs['client'] }, + | { name?: string; result?: R; model?: M; query?: Q; client?: C }, ): (client: any) => PrismaClientExtends export type Extension = runtime.Types.Extensions.UserArgs + // eslint-disable-next-line @typescript-eslint/no-unused-vars export import getExtensionContext = runtime.Extensions.getExtensionContext - export import Args = runtime.Types.Public.Args - export import Payload = runtime.Types.Public.Payload - export import Result = runtime.Types.Public.Result - export import Exact = runtime.Types.Public.Exact - export import PrismaPromise = runtime.Types.Public.PrismaPromise - - export const prismaVersion: { - client: string - engine: string - } + export type Args = runtime.Types.Public.Args & {} + export type Payload = runtime.Types.Public.Payload & {} + export type Result = runtime.Types.Public.Result & {} + export type Exact = runtime.Types.Public.Exact & {} + export type PrismaPromise = runtime.Types.Public.PrismaPromise & {} } diff --git a/packages/client/scripts/default-index.js b/packages/client/scripts/default-index.js index 6a3af0b7fad1..c7144c094b16 100644 --- a/packages/client/scripts/default-index.js +++ b/packages/client/scripts/default-index.js @@ -1,5 +1,3 @@ -const path = require('path') - class PrismaClient { constructor() { throw new Error( @@ -26,13 +24,5 @@ module.exports = { Prisma: { defineExtension, getExtensionContext, - get prismaVersion() { - const atPrismaClientDir = path.dirname(require.resolve('@prisma/client/package.json')) - const enginesVersionDir = require.resolve('@prisma/engines-version', { paths: [atPrismaClientDir] }) - const { version: client } = require('@prisma/client/package.json') - const { enginesVersion: engine } = require(enginesVersionDir) - - return { client, engine } - }, }, } diff --git a/packages/client/src/__tests__/integration/errors/client-version-error/test.ts b/packages/client/src/__tests__/integration/errors/client-version-error/test.ts index 260a4f56bd75..9f8699b0b69a 100644 --- a/packages/client/src/__tests__/integration/errors/client-version-error/test.ts +++ b/packages/client/src/__tests__/integration/errors/client-version-error/test.ts @@ -30,7 +30,7 @@ testIf(getQueryEngineProtocol() !== 'json')('client-version-error', async () => cursor?: UserWhereUniqueInput take?: Int skip?: Int - distinct?: UserScalarFieldEnum | List + distinct?: List } diff --git a/packages/client/src/__tests__/integration/errors/multi-schema/test.ts b/packages/client/src/__tests__/integration/errors/multi-schema/test.ts index f0ced6054543..7ebc47957a0c 100644 --- a/packages/client/src/__tests__/integration/errors/multi-schema/test.ts +++ b/packages/client/src/__tests__/integration/errors/multi-schema/test.ts @@ -10,9 +10,9 @@ let prisma: PrismaClient const baseUri = process.env.TEST_POSTGRES_URI const email = faker.internet.email() -const title = faker.person.jobTitle() +const title = faker.name.jobTitle() const newEmail = faker.internet.email() -const newTitle = faker.person.jobTitle() +const newTitle = faker.name.jobTitle() describe('multischema', () => { beforeAll(async () => { diff --git a/packages/client/src/__tests__/integration/happy/distinct/test.ts b/packages/client/src/__tests__/integration/happy/distinct/test.ts index 2ebe10244016..272688578b1a 100644 --- a/packages/client/src/__tests__/integration/happy/distinct/test.ts +++ b/packages/client/src/__tests__/integration/happy/distinct/test.ts @@ -4,25 +4,17 @@ test('distinct', async () => { const PrismaClient = await getTestClient() const prisma = new PrismaClient() - const resultId = await prisma.user.findMany({ + let result = await prisma.user.findMany({ distinct: ['id'], // distinct on id has no effect, as it's distinct anyway }) - expect(resultId.length).toBe(10) - const resultName = await prisma.user.findMany({ - distinct: ['name'], - }) - expect(resultName.length).toBe(1) + expect(result.length).toBe(10) - const resultIdShortcut = await prisma.user.findMany({ - distinct: 'id', // distinct on id has no effect, as it's distinct anyway + result = await prisma.user.findMany({ + distinct: ['name'], }) - expect(resultIdShortcut.length).toBe(10) - const resultNameShortcut = await prisma.user.findMany({ - distinct: 'name', - }) - expect(resultNameShortcut.length).toBe(1) + expect(result.length).toBe(1) await prisma.$disconnect() }) diff --git a/packages/client/src/__tests__/integration/happy/exhaustive-schema-mongo/__snapshots__/test.ts.snap b/packages/client/src/__tests__/integration/happy/exhaustive-schema-mongo/__snapshots__/test.ts.snap index 558267a9b6ed..f4a30ca2871c 100644 --- a/packages/client/src/__tests__/integration/happy/exhaustive-schema-mongo/__snapshots__/test.ts.snap +++ b/packages/client/src/__tests__/integration/happy/exhaustive-schema-mongo/__snapshots__/test.ts.snap @@ -7,8 +7,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); const { Decimal, objectEnumValues, - makeStrictEnum, - Public, + makeStrictEnum } = require('@prisma/client/runtime/index-browser') @@ -70,19 +69,8 @@ Prisma.raw = () => { throw new Error(\`raw is unable to be run in the browser. In case this error is unexpected for you, please report it in https://github.com/prisma/prisma/issues\`, )} -Prisma.validator = Public.validator +Prisma.validator = () => (val) => val -/** -* Extensions -*/ -Prisma.getExtensionContext = () => { - throw new Error(\`Extensions.getExtensionContext is unable to be run in the browser. -In case this error is unexpected for you, please report it in https://github.com/prisma/prisma/issues\`, -)} -Prisma.defineExtension = () => { - throw new Error(\`Extensions.defineExtension is unable to be run in the browser. -In case this error is unexpected for you, please report it in https://github.com/prisma/prisma/issues\`, -)} /** * Shorthand utilities for JSON filtering @@ -101,31 +89,46 @@ Prisma.NullTypes = { * Enums */ -exports.Prisma.PostScalarFieldEnum = { +exports.Prisma.AScalarFieldEnum = { id: 'id', - createdAt: 'createdAt', - title: 'title', - content: 'content', - published: 'published', - authorId: 'authorId' + email: 'email', + name: 'name', + int: 'int', + sInt: 'sInt', + bInt: 'bInt' }; -exports.Prisma.UserScalarFieldEnum = { +exports.Prisma.BScalarFieldEnum = { id: 'id', - email: 'email', - int: 'int', - optionalInt: 'optionalInt', float: 'float', - optionalFloat: 'optionalFloat', - string: 'string', - optionalString: 'optionalString', + dFloat: 'dFloat' +}; + +exports.Prisma.CScalarFieldEnum = { + id: 'id', + char: 'char', + vChar: 'vChar', + text: 'text', + bit: 'bit', + vBit: 'vBit', + uuid: 'uuid' +}; + +exports.Prisma.DScalarFieldEnum = { + id: 'id', + bool: 'bool', + byteA: 'byteA', + xml: 'xml', json: 'json', - optionalJson: 'optionalJson', - enum: 'enum', - optionalEnum: 'optionalEnum', - boolean: 'boolean', - optionalBoolean: 'optionalBoolean', - embedHolderId: 'embedHolderId' + jsonb: 'jsonb', + list: 'list' +}; + +exports.Prisma.EScalarFieldEnum = { + id: 'id', + date: 'date', + time: 'time', + ts: 'ts' }; exports.Prisma.EmbedHolderScalarFieldEnum = { @@ -152,9 +155,9 @@ exports.Prisma.MScalarFieldEnum = { optionalBoolean: 'optionalBoolean' }; -exports.Prisma.NScalarFieldEnum = { +exports.Prisma.ManyRequiredScalarFieldEnum = { id: 'id', - m_ids: 'm_ids', + oneOptionalId: 'oneOptionalId', int: 'int', optionalInt: 'optionalInt', float: 'float', @@ -169,8 +172,9 @@ exports.Prisma.NScalarFieldEnum = { optionalBoolean: 'optionalBoolean' }; -exports.Prisma.OneOptionalScalarFieldEnum = { +exports.Prisma.NScalarFieldEnum = { id: 'id', + m_ids: 'm_ids', int: 'int', optionalInt: 'optionalInt', float: 'float', @@ -185,9 +189,8 @@ exports.Prisma.OneOptionalScalarFieldEnum = { optionalBoolean: 'optionalBoolean' }; -exports.Prisma.ManyRequiredScalarFieldEnum = { +exports.Prisma.OneOptionalScalarFieldEnum = { id: 'id', - oneOptionalId: 'oneOptionalId', int: 'int', optionalInt: 'optionalInt', float: 'float', @@ -235,46 +238,18 @@ exports.Prisma.OptionalSide2ScalarFieldEnum = { optionalBoolean: 'optionalBoolean' }; -exports.Prisma.AScalarFieldEnum = { - id: 'id', - email: 'email', - name: 'name', - int: 'int', - sInt: 'sInt', - bInt: 'bInt' -}; - -exports.Prisma.BScalarFieldEnum = { - id: 'id', - float: 'float', - dFloat: 'dFloat' -}; - -exports.Prisma.CScalarFieldEnum = { - id: 'id', - char: 'char', - vChar: 'vChar', - text: 'text', - bit: 'bit', - vBit: 'vBit', - uuid: 'uuid' -}; - -exports.Prisma.DScalarFieldEnum = { +exports.Prisma.PostScalarFieldEnum = { id: 'id', - bool: 'bool', - byteA: 'byteA', - xml: 'xml', - json: 'json', - jsonb: 'jsonb', - list: 'list' + createdAt: 'createdAt', + title: 'title', + content: 'content', + published: 'published', + authorId: 'authorId' }; -exports.Prisma.EScalarFieldEnum = { - id: 'id', - date: 'date', - time: 'time', - ts: 'ts' +exports.Prisma.QueryMode = { + default: 'default', + insensitive: 'insensitive' }; exports.Prisma.SortOrder = { @@ -282,9 +257,22 @@ exports.Prisma.SortOrder = { desc: 'desc' }; -exports.Prisma.QueryMode = { - default: 'default', - insensitive: 'insensitive' +exports.Prisma.UserScalarFieldEnum = { + id: 'id', + email: 'email', + int: 'int', + optionalInt: 'optionalInt', + float: 'float', + optionalFloat: 'optionalFloat', + string: 'string', + optionalString: 'optionalString', + json: 'json', + optionalJson: 'optionalJson', + enum: 'enum', + optionalEnum: 'optionalEnum', + boolean: 'boolean', + optionalBoolean: 'optionalBoolean', + embedHolderId: 'embedHolderId' }; exports.ABeautifulEnum = { A: 'A', @@ -333,378 +321,277 @@ exports[`exhaustive-schema: generatedTypeScript 1`] = ` **/ import * as runtime from '@prisma/client/runtime/{RUNTIME_FILE}'; -import $Types = runtime.Types // general types -import $Public = runtime.Types.Public -import $Utils = runtime.Types.Utils -import $Extensions = runtime.Types.Extensions - -export type PrismaPromise = $Public.PrismaPromise +type UnwrapPromise = P extends Promise
? R : P +type UnwrapTuple = { + [K in keyof Tuple]: K extends \`\${number}\` ? Tuple[K] extends Prisma.PrismaPromise ? X : UnwrapPromise : UnwrapPromise +}; +export type PrismaPromise = runtime.Types.Public.PrismaPromise -export type EmbedPayload = { - objects: {} - scalars: { - text: string - boolean: boolean - scalarList: number[] - } - composites: { - embedEmbedList: EmbedEmbedPayload[] - requiredEmbedEmbed: EmbedEmbedPayload - optionalEmbedEmbed: EmbedEmbedPayload | null - } -} /** * Model Embed * */ -export type Embed = runtime.Types.DefaultSelection -export type EmbedEmbedPayload = { - objects: {} - scalars: { - text: string - boolean: boolean - } - composites: {} +export type Embed = { + text: string + boolean: boolean + embedEmbedList: EmbedEmbed[] + requiredEmbedEmbed: EmbedEmbed + optionalEmbedEmbed: EmbedEmbed | null + scalarList: number[] } /** * Model EmbedEmbed * */ -export type EmbedEmbed = runtime.Types.DefaultSelection -export type PostPayload = { - objects: { - author: UserPayload - } - scalars: $Extensions.GetResult<{ - id: string - createdAt: Date - title: string - content: string | null - published: boolean - authorId: string - }, ExtArgs["result"]["post"]> - composites: {} +export type EmbedEmbed = { + text: string + boolean: boolean } /** * Model Post * */ -export type Post = runtime.Types.DefaultSelection -export type UserPayload = { - objects: { - posts: PostPayload [] - embedHolder: EmbedHolderPayload - } - scalars: $Extensions.GetResult<{ - id: string - email: string - int: number - optionalInt: number | null - float: number - optionalFloat: number | null - string: string - optionalString: string | null - json: Prisma.JsonValue - optionalJson: Prisma.JsonValue | null - enum: ABeautifulEnum - optionalEnum: ABeautifulEnum | null - boolean: boolean - optionalBoolean: boolean | null - embedHolderId: string - }, ExtArgs["result"]["user"]> - composites: {} +export type Post = { + id: string + createdAt: Date + title: string + content: string | null + published: boolean + authorId: string } /** * Model User * */ -export type User = runtime.Types.DefaultSelection -export type EmbedHolderPayload = { - objects: { - User: UserPayload [] - } - scalars: $Extensions.GetResult<{ - id: string - time: Date - text: string - boolean: boolean - }, ExtArgs["result"]["embedHolder"]> - composites: { - embedList: EmbedPayload[] - requiredEmbed: EmbedPayload - optionalEmbed: EmbedPayload | null - } +export type User = { + id: string + email: string + int: number + optionalInt: number | null + float: number + optionalFloat: number | null + string: string + optionalString: string | null + json: Prisma.JsonValue + optionalJson: Prisma.JsonValue | null + enum: ABeautifulEnum + optionalEnum: ABeautifulEnum | null + boolean: boolean + optionalBoolean: boolean | null + embedHolderId: string } /** * Model EmbedHolder * */ -export type EmbedHolder = runtime.Types.DefaultSelection -export type MPayload = { - objects: { - n: NPayload [] - } - scalars: $Extensions.GetResult<{ - id: string - n_ids: string[] - int: number - optionalInt: number | null - float: number - optionalFloat: number | null - string: string - optionalString: string | null - json: Prisma.JsonValue - optionalJson: Prisma.JsonValue | null - enum: ABeautifulEnum - optionalEnum: ABeautifulEnum | null - boolean: boolean - optionalBoolean: boolean | null - }, ExtArgs["result"]["m"]> - composites: {} +export type EmbedHolder = { + id: string + time: Date + text: string + boolean: boolean + embedList: Embed[] + requiredEmbed: Embed + optionalEmbed: Embed | null } /** * Model M * */ -export type M = runtime.Types.DefaultSelection -export type NPayload = { - objects: { - m: MPayload [] - } - scalars: $Extensions.GetResult<{ - id: string - m_ids: string[] - int: number - optionalInt: number | null - float: number - optionalFloat: number | null - string: string - optionalString: string | null - json: Prisma.JsonValue - optionalJson: Prisma.JsonValue | null - enum: ABeautifulEnum - optionalEnum: ABeautifulEnum | null - boolean: boolean - optionalBoolean: boolean | null - }, ExtArgs["result"]["n"]> - composites: {} +export type M = { + id: string + n_ids: string[] + int: number + optionalInt: number | null + float: number + optionalFloat: number | null + string: string + optionalString: string | null + json: Prisma.JsonValue + optionalJson: Prisma.JsonValue | null + enum: ABeautifulEnum + optionalEnum: ABeautifulEnum | null + boolean: boolean + optionalBoolean: boolean | null } /** * Model N * */ -export type N = runtime.Types.DefaultSelection -export type OneOptionalPayload = { - objects: { - many: ManyRequiredPayload [] - } - scalars: $Extensions.GetResult<{ - id: string - int: number - optionalInt: number | null - float: number - optionalFloat: number | null - string: string - optionalString: string | null - json: Prisma.JsonValue - optionalJson: Prisma.JsonValue | null - enum: ABeautifulEnum - optionalEnum: ABeautifulEnum | null - boolean: boolean - optionalBoolean: boolean | null - }, ExtArgs["result"]["oneOptional"]> - composites: {} +export type N = { + id: string + m_ids: string[] + int: number + optionalInt: number | null + float: number + optionalFloat: number | null + string: string + optionalString: string | null + json: Prisma.JsonValue + optionalJson: Prisma.JsonValue | null + enum: ABeautifulEnum + optionalEnum: ABeautifulEnum | null + boolean: boolean + optionalBoolean: boolean | null } /** * Model OneOptional * */ -export type OneOptional = runtime.Types.DefaultSelection -export type ManyRequiredPayload = { - objects: { - one: OneOptionalPayload | null - } - scalars: $Extensions.GetResult<{ - id: string - oneOptionalId: string | null - int: number - optionalInt: number | null - float: number - optionalFloat: number | null - string: string - optionalString: string | null - json: Prisma.JsonValue - optionalJson: Prisma.JsonValue | null - enum: ABeautifulEnum - optionalEnum: ABeautifulEnum | null - boolean: boolean - optionalBoolean: boolean | null - }, ExtArgs["result"]["manyRequired"]> - composites: {} +export type OneOptional = { + id: string + int: number + optionalInt: number | null + float: number + optionalFloat: number | null + string: string + optionalString: string | null + json: Prisma.JsonValue + optionalJson: Prisma.JsonValue | null + enum: ABeautifulEnum + optionalEnum: ABeautifulEnum | null + boolean: boolean + optionalBoolean: boolean | null } /** * Model ManyRequired * */ -export type ManyRequired = runtime.Types.DefaultSelection -export type OptionalSide1Payload = { - objects: { - opti: OptionalSide2Payload | null - } - scalars: $Extensions.GetResult<{ - id: string - optionalSide2Id: string | null - int: number - optionalInt: number | null - float: number - optionalFloat: number | null - string: string - optionalString: string | null - json: Prisma.JsonValue - optionalJson: Prisma.JsonValue | null - enum: ABeautifulEnum - optionalEnum: ABeautifulEnum | null - boolean: boolean - optionalBoolean: boolean | null - }, ExtArgs["result"]["optionalSide1"]> - composites: {} +export type ManyRequired = { + id: string + oneOptionalId: string | null + int: number + optionalInt: number | null + float: number + optionalFloat: number | null + string: string + optionalString: string | null + json: Prisma.JsonValue + optionalJson: Prisma.JsonValue | null + enum: ABeautifulEnum + optionalEnum: ABeautifulEnum | null + boolean: boolean + optionalBoolean: boolean | null } /** * Model OptionalSide1 * */ -export type OptionalSide1 = runtime.Types.DefaultSelection -export type OptionalSide2Payload = { - objects: { - opti: OptionalSide1Payload | null - } - scalars: $Extensions.GetResult<{ - id: string - int: number - optionalInt: number | null - float: number - optionalFloat: number | null - string: string - optionalString: string | null - json: Prisma.JsonValue - optionalJson: Prisma.JsonValue | null - enum: ABeautifulEnum - optionalEnum: ABeautifulEnum | null - boolean: boolean - optionalBoolean: boolean | null - }, ExtArgs["result"]["optionalSide2"]> - composites: {} +export type OptionalSide1 = { + id: string + optionalSide2Id: string | null + int: number + optionalInt: number | null + float: number + optionalFloat: number | null + string: string + optionalString: string | null + json: Prisma.JsonValue + optionalJson: Prisma.JsonValue | null + enum: ABeautifulEnum + optionalEnum: ABeautifulEnum | null + boolean: boolean + optionalBoolean: boolean | null } /** * Model OptionalSide2 * */ -export type OptionalSide2 = runtime.Types.DefaultSelection -export type APayload = { - objects: {} - scalars: $Extensions.GetResult<{ - /** - * field comment 1 - */ - id: string - email: string - name: string | null - /** - * field comment 2 - */ - int: number - sInt: number - bInt: bigint - }, ExtArgs["result"]["a"]> - composites: {} +export type OptionalSide2 = { + id: string + int: number + optionalInt: number | null + float: number + optionalFloat: number | null + string: string + optionalString: string | null + json: Prisma.JsonValue + optionalJson: Prisma.JsonValue | null + enum: ABeautifulEnum + optionalEnum: ABeautifulEnum | null + boolean: boolean + optionalBoolean: boolean | null } /** * Model A * model comment */ -export type A = runtime.Types.DefaultSelection -export type BPayload = { - objects: {} - scalars: $Extensions.GetResult<{ - id: string - float: number - dFloat: number - }, ExtArgs["result"]["b"]> - composites: {} +export type A = { + /** + * field comment 1 + */ + id: string + email: string + name: string | null + /** + * field comment 2 + */ + int: number + sInt: number + bInt: bigint } /** * Model B * */ -export type B = runtime.Types.DefaultSelection -export type CPayload = { - objects: {} - scalars: $Extensions.GetResult<{ - id: string - char: string - vChar: string - text: string - bit: string - vBit: string - uuid: string - }, ExtArgs["result"]["c"]> - composites: {} +export type B = { + id: string + float: number + dFloat: number } /** * Model C * */ -export type C = runtime.Types.DefaultSelection -export type DPayload = { - objects: {} - scalars: $Extensions.GetResult<{ - id: string - bool: boolean - byteA: Buffer - xml: string - json: Prisma.JsonValue - jsonb: Prisma.JsonValue - list: number[] - }, ExtArgs["result"]["d"]> - composites: {} +export type C = { + id: string + char: string + vChar: string + text: string + bit: string + vBit: string + uuid: string } /** * Model D * */ -export type D = runtime.Types.DefaultSelection -export type EPayload = { - objects: {} - scalars: $Extensions.GetResult<{ - id: string - date: Date - time: Date - ts: Date - }, ExtArgs["result"]["e"]> - composites: {} +export type D = { + id: string + bool: boolean + byteA: Buffer + xml: string + json: Prisma.JsonValue + jsonb: Prisma.JsonValue + list: number[] } /** * Model E * */ -export type E = runtime.Types.DefaultSelection +export type E = { + id: string + date: Date + time: Date + ts: Date +} + /** * Enums @@ -738,11 +625,8 @@ export class PrismaClient< U = 'log' extends keyof T ? T['log'] extends Array ? Prisma.GetEvents : never : never, GlobalReject extends Prisma.RejectOnNotFound | Prisma.RejectPerOperation | false | undefined = 'rejectOnNotFound' extends keyof T ? T['rejectOnNotFound'] - : false, - ExtArgs extends $Extensions.Args = $Extensions.DefaultArgs -> { - [K: symbol]: { types: Prisma.TypeMap ['other'] } - + : false + > { /** * ## Prisma Client ʲˢ * @@ -773,8 +657,6 @@ export class PrismaClient< /** * Add a middleware - * @deprecated since 4.16.0. For new code, prefer client extensions instead. - * @see https://pris.ly/d/extensions */ $use(cb: Prisma.Middleware): void @@ -791,9 +673,9 @@ export class PrismaClient< * * Read more in our [docs](https://www.prisma.io/docs/concepts/components/prisma-client/transactions). */ - $transaction []>(arg: [...P]): Promise
> + $transaction []>(arg: [...P]): Promise
> - $transaction (fn: (prisma: Omit ) => Promise , options?: { maxWait?: number, timeout?: number }): Promise + $transaction (fn: (prisma: Omit ) => Promise , options?: { maxWait?: number, timeout?: number }): Promise /** * Executes a raw MongoDB command and returns the result of it. @@ -810,8 +692,6 @@ export class PrismaClient< */ $runCommandRaw(command: Prisma.InputJsonObject): Prisma.PrismaPromise - $extends: $Extensions.ExtendsHook<'extends', Prisma.TypeMapCb, ExtArgs> - /** * \`prisma.post\`: Exposes CRUD operations for the **Post** model. * Example usage: @@ -820,7 +700,7 @@ export class PrismaClient< * const posts = await prisma.post.findMany() * \`\`\` */ - get post(): Prisma.PostDelegate ; + get post(): Prisma.PostDelegate ; /** * \`prisma.user\`: Exposes CRUD operations for the **User** model. @@ -830,7 +710,7 @@ export class PrismaClient< * const users = await prisma.user.findMany() * \`\`\` */ - get user(): Prisma.UserDelegate ; + get user(): Prisma.UserDelegate ; /** * \`prisma.embedHolder\`: Exposes CRUD operations for the **EmbedHolder** model. @@ -840,7 +720,7 @@ export class PrismaClient< * const embedHolders = await prisma.embedHolder.findMany() * \`\`\` */ - get embedHolder(): Prisma.EmbedHolderDelegate ; + get embedHolder(): Prisma.EmbedHolderDelegate ; /** * \`prisma.m\`: Exposes CRUD operations for the **M** model. @@ -850,7 +730,7 @@ export class PrismaClient< * const ms = await prisma.m.findMany() * \`\`\` */ - get m(): Prisma.MDelegate ; + get m(): Prisma.MDelegate ; /** * \`prisma.n\`: Exposes CRUD operations for the **N** model. @@ -860,7 +740,7 @@ export class PrismaClient< * const ns = await prisma.n.findMany() * \`\`\` */ - get n(): Prisma.NDelegate ; + get n(): Prisma.NDelegate ; /** * \`prisma.oneOptional\`: Exposes CRUD operations for the **OneOptional** model. @@ -870,7 +750,7 @@ export class PrismaClient< * const oneOptionals = await prisma.oneOptional.findMany() * \`\`\` */ - get oneOptional(): Prisma.OneOptionalDelegate ; + get oneOptional(): Prisma.OneOptionalDelegate ; /** * \`prisma.manyRequired\`: Exposes CRUD operations for the **ManyRequired** model. @@ -880,7 +760,7 @@ export class PrismaClient< * const manyRequireds = await prisma.manyRequired.findMany() * \`\`\` */ - get manyRequired(): Prisma.ManyRequiredDelegate ; + get manyRequired(): Prisma.ManyRequiredDelegate ; /** * \`prisma.optionalSide1\`: Exposes CRUD operations for the **OptionalSide1** model. @@ -890,7 +770,7 @@ export class PrismaClient< * const optionalSide1s = await prisma.optionalSide1.findMany() * \`\`\` */ - get optionalSide1(): Prisma.OptionalSide1Delegate ; + get optionalSide1(): Prisma.OptionalSide1Delegate ; /** * \`prisma.optionalSide2\`: Exposes CRUD operations for the **OptionalSide2** model. @@ -900,7 +780,7 @@ export class PrismaClient< * const optionalSide2s = await prisma.optionalSide2.findMany() * \`\`\` */ - get optionalSide2(): Prisma.OptionalSide2Delegate ; + get optionalSide2(): Prisma.OptionalSide2Delegate ; /** * \`prisma.a\`: Exposes CRUD operations for the **A** model. @@ -910,7 +790,7 @@ export class PrismaClient< * const as = await prisma.a.findMany() * \`\`\` */ - get a(): Prisma.ADelegate ; + get a(): Prisma.ADelegate ; /** * \`prisma.b\`: Exposes CRUD operations for the **B** model. @@ -920,7 +800,7 @@ export class PrismaClient< * const bs = await prisma.b.findMany() * \`\`\` */ - get b(): Prisma.BDelegate ; + get b(): Prisma.BDelegate ; /** * \`prisma.c\`: Exposes CRUD operations for the **C** model. @@ -930,7 +810,7 @@ export class PrismaClient< * const cs = await prisma.c.findMany() * \`\`\` */ - get c(): Prisma.CDelegate ; + get c(): Prisma.CDelegate ; /** * \`prisma.d\`: Exposes CRUD operations for the **D** model. @@ -940,7 +820,7 @@ export class PrismaClient< * const ds = await prisma.d.findMany() * \`\`\` */ - get d(): Prisma.DDelegate ; + get d(): Prisma.DDelegate ; /** * \`prisma.e\`: Exposes CRUD operations for the **E** model. @@ -950,18 +830,13 @@ export class PrismaClient< * const es = await prisma.e.findMany() * \`\`\` */ - get e(): Prisma.EDelegate ; + get e(): Prisma.EDelegate ; } export namespace Prisma { export import DMMF = runtime.DMMF - export type PrismaPromise = $Public.PrismaPromise - - /** - * Validator - */ - export import validator = runtime.Public.validator + export type PrismaPromise = runtime.Types.Public.PrismaPromise /** * Prisma Errors @@ -997,15 +872,6 @@ export namespace Prisma { export type MetricHistogram = runtime.MetricHistogram export type MetricHistogramBucket = runtime.MetricHistogramBucket - /** - * Extensions - */ - export type Extension = $Extensions.UserArgs - export import getExtensionContext = runtime.Extensions.getExtensionContext - export type Args = $Public.Args - export type Payload = $Public.Payload - export type Result = $Public.Result - export type Exact = $Public.Exact /** * Prisma Client JS version: local @@ -1377,7 +1243,7 @@ export namespace Prisma { export const type: unique symbol; - + export function validator (): (select: runtime.Types.Utils.LegacyExact) => S; /** * Used by group by @@ -1457,1246 +1323,6 @@ export namespace Prisma { db?: Datasource } - - interface TypeMapCb extends $Utils.Fn<{extArgs: $Extensions.Args}, $Utils.Record> { - returns: Prisma.TypeMap - } - - export type TypeMap = { - meta: { - modelProps: 'post' | 'user' | 'embedHolder' | 'm' | 'n' | 'oneOptional' | 'manyRequired' | 'optionalSide1' | 'optionalSide2' | 'a' | 'b' | 'c' | 'd' | 'e' - txIsolationLevel: never - }, - model: { - Post: { - findUnique: { - args: Prisma.PostFindUniqueArgs , - result: $Utils.OptionalFlat - payload: PostPayload - } - findUniqueOrThrow: { - args: Prisma.PostFindUniqueOrThrowArgs , - result: $Utils.OptionalFlat - payload: PostPayload - } - findFirst: { - args: Prisma.PostFindFirstArgs , - result: $Utils.OptionalFlat - payload: PostPayload - } - findFirstOrThrow: { - args: Prisma.PostFindFirstOrThrowArgs , - result: $Utils.OptionalFlat - payload: PostPayload - } - findMany: { - args: Prisma.PostFindManyArgs , - result: $Utils.OptionalFlat - payload: PostPayload - } - create: { - args: Prisma.PostCreateArgs , - result: $Utils.OptionalFlat - payload: PostPayload - } - createMany: { - args: Prisma.PostCreateManyArgs , - result: $Utils.OptionalFlat - payload: PostPayload - } - delete: { - args: Prisma.PostDeleteArgs , - result: $Utils.OptionalFlat - payload: PostPayload - } - update: { - args: Prisma.PostUpdateArgs , - result: $Utils.OptionalFlat - payload: PostPayload - } - deleteMany: { - args: Prisma.PostDeleteManyArgs , - result: $Utils.OptionalFlat - payload: PostPayload - } - updateMany: { - args: Prisma.PostUpdateManyArgs , - result: $Utils.OptionalFlat - payload: PostPayload - } - upsert: { - args: Prisma.PostUpsertArgs , - result: $Utils.OptionalFlat - payload: PostPayload - } - aggregate: { - args: Prisma.PostAggregateArgs , - result: $Utils.OptionalFlat - payload: PostPayload - } - groupBy: { - args: Prisma.PostGroupByArgs , - result: $Utils.OptionalFlat - payload: PostPayload - } - findRaw: { - args: Prisma.PostFindRawArgs , - result: $Utils.OptionalFlat - payload: PostPayload - } - aggregateRaw: { - args: Prisma.PostAggregateRawArgs , - result: $Utils.OptionalFlat - payload: PostPayload - } - count: { - args: Prisma.PostCountArgs , - result: $Utils.OptionalFlat - payload: PostPayload - } - } - User: { - findUnique: { - args: Prisma.UserFindUniqueArgs , - result: $Utils.OptionalFlat - payload: UserPayload - } - findUniqueOrThrow: { - args: Prisma.UserFindUniqueOrThrowArgs , - result: $Utils.OptionalFlat - payload: UserPayload - } - findFirst: { - args: Prisma.UserFindFirstArgs , - result: $Utils.OptionalFlat - payload: UserPayload - } - findFirstOrThrow: { - args: Prisma.UserFindFirstOrThrowArgs , - result: $Utils.OptionalFlat - payload: UserPayload - } - findMany: { - args: Prisma.UserFindManyArgs , - result: $Utils.OptionalFlat - payload: UserPayload - } - create: { - args: Prisma.UserCreateArgs , - result: $Utils.OptionalFlat - payload: UserPayload - } - createMany: { - args: Prisma.UserCreateManyArgs , - result: $Utils.OptionalFlat - payload: UserPayload - } - delete: { - args: Prisma.UserDeleteArgs , - result: $Utils.OptionalFlat - payload: UserPayload - } - update: { - args: Prisma.UserUpdateArgs , - result: $Utils.OptionalFlat - payload: UserPayload - } - deleteMany: { - args: Prisma.UserDeleteManyArgs , - result: $Utils.OptionalFlat - payload: UserPayload - } - updateMany: { - args: Prisma.UserUpdateManyArgs , - result: $Utils.OptionalFlat - payload: UserPayload - } - upsert: { - args: Prisma.UserUpsertArgs , - result: $Utils.OptionalFlat - payload: UserPayload - } - aggregate: { - args: Prisma.UserAggregateArgs , - result: $Utils.OptionalFlat - payload: UserPayload - } - groupBy: { - args: Prisma.UserGroupByArgs , - result: $Utils.OptionalFlat - payload: UserPayload - } - findRaw: { - args: Prisma.UserFindRawArgs , - result: $Utils.OptionalFlat - payload: UserPayload - } - aggregateRaw: { - args: Prisma.UserAggregateRawArgs , - result: $Utils.OptionalFlat - payload: UserPayload - } - count: { - args: Prisma.UserCountArgs , - result: $Utils.OptionalFlat - payload: UserPayload - } - } - EmbedHolder: { - findUnique: { - args: Prisma.EmbedHolderFindUniqueArgs , - result: $Utils.OptionalFlat - payload: EmbedHolderPayload - } - findUniqueOrThrow: { - args: Prisma.EmbedHolderFindUniqueOrThrowArgs , - result: $Utils.OptionalFlat - payload: EmbedHolderPayload - } - findFirst: { - args: Prisma.EmbedHolderFindFirstArgs , - result: $Utils.OptionalFlat - payload: EmbedHolderPayload - } - findFirstOrThrow: { - args: Prisma.EmbedHolderFindFirstOrThrowArgs , - result: $Utils.OptionalFlat - payload: EmbedHolderPayload