Make conflict detection between branch and database less strict.#487
Merged
vpetrovykh merged 3 commits intomasterfrom Apr 25, 2024
Merged
Make conflict detection between branch and database less strict.#487vpetrovykh merged 3 commits intomasterfrom
vpetrovykh merged 3 commits intomasterfrom
Conversation
It is an error to specify `database` and `branch` at the same time on the same configuration level. It is OK to override previous configuration with either `database` or `branch`. It is OK for the credentials file to contain both `database` and `branch` fields in order to facilitate transitioning from old style to the new style while maintaining backwards compatibility. The values must agree, though.
If the `EDGEDB_CLOUD_PROFILE` is set, it should be visible at any point in the configuration resolution process.
aljazerzen
approved these changes
Apr 10, 2024
Contributor
|
I've implemented the same behavior in edgedb-rust. When writing credentials.json, I've even implemented writing both branch and database, so it is backward compatible. This is useful if credentials.json is written by CLI on the new version and then old version of bindings reads it. |
fantix
added a commit
that referenced
this pull request
Jun 19, 2024
New Features ============ * Support EdgeDB 5.0 "branch" connection option (by @vpetrovykh in #484 #485 #487) * Support EdgeDB 5.0 AI extension (by @fantix in #489 #490) Breaking Changes ================ * Enum values can now compare to user-defined enums successfully (#425) (by @fantix in bb7522c for #419) * Add optional default to codegen params (#426) (by @fantix in 21b024a for #422) Changes ======= * blocking client: fix connect and timeout, support IPv6 (#499) (by @fantix @zachary822 in 28a83fd for #486) Fixes ===== * Add test to check setting a computed global using with_globals. (#494) (by @dnwpark in 636bc0e for #494) * Fix test and add Python 3.12 in CI (by @fantix in #498 #503) * Use result of pydantic_dataclass, will silence linters (#501) (by @AdrienPensart in d88187a) 6880 * Extract ExecuteContext as in/out argument (#500) (by @fantix in 2fb7965 for #493)
Merged
fantix
added a commit
that referenced
this pull request
Jun 19, 2024
New Features ============ * Support EdgeDB 5.0 "branch" connection option (by @vpetrovykh in #484 #485 #487) * Support EdgeDB 5.0 AI extension (by @fantix in #489 #490) Breaking Changes ================ * Enum values can now compare to user-defined enums successfully (#425) (by @fantix in bb7522c for #419) * Add optional default to codegen params (#426) (by @fantix in 21b024a for #422) Changes ======= * blocking client: fix connect and timeout, support IPv6 (#499) (by @fantix @zachary822 in 28a83fd for #486) Fixes ===== * Add test to check setting a computed global using with_globals. (#494) (by @dnwpark in 636bc0e for #494) * Fix test and add Python 3.12 in CI (by @fantix in #498 #503) * Use result of pydantic_dataclass, will silence linters (#501) (by @AdrienPensart in d88187a) * Extract ExecuteContext as in/out argument (#500) (by @fantix in 2fb7965 for #493)
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
It is an error to specify
databaseandbranchat the same time on the same configuration level.It is OK to override previous configuration with either
databaseorbranch.It is OK for the credentials file to contain both
databaseandbranchfields in order to facilitate transitioning from old style to the new style while maintaining backwards compatibility. The values must agree, though.