New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(client): fix isolated data proxy issues [DPGA, 3] #13599

Merged

millsp merged 9 commits into chore/data-proxy-ga-2 from chore/data-proxy-ga-3

Jun 7, 2022

Member

millsp commented Jun 1, 2022 •

edited

This PR fixes isolated data proxy issues that haven't been fixed by previous PRs (see commit messages). For reviewing this PR, please look at the changes of each individual commit since the issues being fixed are unrelated.

Prev #13512
Next #13627

https://github.com/orgs/prisma/projects/70#card-82640155

millsp added 3 commits

June 1, 2022 11:05


          handle and retry on network errors

13bd199


          fix missing require('path') in node.js

ce8ce77


          let the data proxy look for dirname

millsp commented

View reviewed changes

packages/engine-core/src/data-proxy/DataProxyEngine.ts Show resolved Hide resolved

millsp commented

View reviewed changes

packages/engine-core/src/data-proxy/utils/request.ts Outdated Show resolved Hide resolved

millsp mentioned this pull request

chore(client): split the runtime into two [DPGA, 2] #13512

Merged


          fix error with custom schema location not found

ca0c722

millsp force-pushed the chore/data-proxy-ga-3 branch from 682002d to ca0c722 Compare

June 1, 2022 12:31

millsp marked this pull request as ready for review

June 1, 2022 12:49

millsp requested review from aqrln, SevInf and danstarns as code owners

June 1, 2022 12:49

millsp added this to the 3.15.0 milestone


          try to fix bug where ts-jest hangs

millsp force-pushed the chore/data-proxy-ga-3 branch from e36ab88 to 2654584 Compare

June 1, 2022 21:28

millsp requested review from Jolg42 and jkomyno as code owners

June 1, 2022 21:54


          make dataProxy required after fixing ts-jest issue

78635f7

millsp force-pushed the chore/data-proxy-ga-3 branch from bb15e6f to 78635f7 Compare

June 1, 2022 22:06

millsp commented

View reviewed changes

packages/engine-core/src/data-proxy/errors/NetworkError.ts Outdated Show resolved Hide resolved

millsp commented

View reviewed changes

packages/client/src/generation/TSClient/TSClient.ts Show resolved Hide resolved

millsp commented

View reviewed changes

packages/client/src/generation/TSClient/TSClient.ts Show resolved Hide resolved

millsp commented

View reviewed changes

packages/client/src/generation/utils/buildDirname.ts Show resolved Hide resolved

millsp commented

View reviewed changes

packages/client/src/generation/TSClient/TSClient.ts Show resolved Hide resolved

millsp commented

View reviewed changes

packages/client/src/generation/TSClient/TSClient.ts Show resolved Hide resolved

millsp commented

View reviewed changes

packages/client/src/generation/generateClient.ts Show resolved Hide resolved

millsp commented

View reviewed changes

packages/client/jest.config.js Show resolved Hide resolved

millsp commented

View reviewed changes

packages/cli/src/Generate.ts Show resolved Hide resolved

SevInf reviewed

View reviewed changes

packages/engine-core/src/data-proxy/utils/request.ts Outdated Show resolved Hide resolved

millsp force-pushed the chore/data-proxy-ga-3 branch from 164c839 to 78635f7 Compare

June 2, 2022 10:01

aqrln approved these changes

View reviewed changes

millsp mentioned this pull request

chore(cli, client): check that prisma:// cannot be used with unsupported commands [DPGA, 4] #13627

Merged

janpio assigned millsp

janpio changed the title ~~chore(client): fix isolated data proxy issues [DPGA]~~ chore(client): fix isolated data proxy issues [DPGA-4]

janpio changed the title ~~chore(client): fix isolated data proxy issues [DPGA-4]~~ chore(client): fix isolated data proxy issues [DPGA, 4]

janpio added the topic: data proxy label

millsp changed the title ~~chore(client): fix isolated data proxy issues [DPGA, 4]~~ chore(client): fix isolated data proxy issues [DPGA, 3]


          Merge branch 'chore/data-proxy-ga-2' of github.com:prisma/prisma into…

c7e0175

… chore/data-proxy-ga-3

millsp mentioned this pull request

chore(*): polishing upstream work on the data proxy [DPGA, 5] #13629

Merged

14 tasks

millsp and others added 2 commits

June 7, 2022 12:08


          Merge branch 'chore/data-proxy-ga-2' into chore/data-proxy-ga-3

91ea26a


          chore(cli, client): check that prisma:// cannot be used with unsupp…

ce2a8f7

…orted commands [DPGA, 4] (#13627)

Co-authored-by: Alexey Orlenko <alex@aqrln.net>

millsp merged commit 730dcb6 into chore/data-proxy-ga-2

millsp deleted the chore/data-proxy-ga-3 branch

June 7, 2022 12:04

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment