qe: repair OVERWRITE_DATASOURCES param in binary CLI #3203
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
What happened: - We introduced psl::ValidatedSchema in the QE. Unlike `parse_dml()`, it does not throw away the configuration part of the schema. - We started using the configuration from the ValidatedSchema instead of calling `psl::parse_configuration()` on the same schema again through `Opts::configuration()`. That saved work and code. - The logic about ignoring env vars, which is coupled to the logic for overriding datasource URLs, suddenly was out of the code paths. - We were not overriding the datasource URLs anymore. That made the client tests fail in non-obvious ways in prisma/prisma. How this commit fixes it: - `Opts::schema()` now takes the same `ignore_env_var_errors` param as `Opts::configuration()` and overrides datasource urls in the same way. It may be worth revisiting this whole mechanism later, but this should fix prisma/prisma integration for now.
garrensmith
approved these changes
Sep 20, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What happened:
parse_dml(), it does not throw away the configuration part of the schema.psl::parse_configuration()on the same schema again throughOpts::configuration(). That saved work and code.How this commit fixes it:
Opts::schema()now takes the sameignore_env_var_errorsparam asOpts::configuration()and overrides datasource urls in the same way.It may be worth revisiting this whole mechanism later, but this should fix prisma/prisma integration for now.