sql: don't use SetWithPlanner for password_encryption#123793
Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom May 8, 2024
Merged
sql: don't use SetWithPlanner for password_encryption#123793craig[bot] merged 1 commit intocockroachdb:masterfrom
password_encryption#123793craig[bot] merged 1 commit intocockroachdb:masterfrom
Conversation
|
It looks like your PR touches production code but doesn't add or edit any test code. Did you consider adding tests to your PR? 🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf. |
Member
|
This change is |
rafiss
requested changes
May 8, 2024
Collaborator
rafiss
left a comment
There was a problem hiding this comment.
i think this revealed a bug elsewhere. we probably should apply this diff:
diff --git a/pkg/sql/pg_catalog.go b/pkg/sql/pg_catalog.go
index 19d8eeac958..aca1407eaa6 100644
--- a/pkg/sql/pg_catalog.go
+++ b/pkg/sql/pg_catalog.go
@@ -3018,7 +3018,7 @@ https://www.postgresql.org/docs/9.5/catalog-pg-settings.html`,
valueDatum := tree.NewDString(value)
var bootDatum tree.Datum = tree.DNull
var resetDatum tree.Datum = tree.DNull
- if gen.Set == nil && gen.RuntimeSet == nil {
+ if gen.Set == nil && gen.RuntimeSet == nil && gen.SetWithPlanner == nil {
// RESET/SET will leave the variable unchanged. Announce the
// current value as boot/reset value.
bootDatum = valueDatum
and to make your PR work, you might need to set a GlobalDefault for this variable
Reviewable status:
complete! 0 of 0 LGTMs obtained
Using the default Set method is sufficient. Release note: None
73e4212 to
821cb7f
Compare
yuzefovich
commented
May 8, 2024
Member
Author
yuzefovich
left a comment
There was a problem hiding this comment.
Thanks, done.
Reviewable status:
rafiss
approved these changes
May 8, 2024
Member
Author
|
TFTR! bors r+ |
Contributor
This was referenced May 16, 2024
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
3 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.
Using the default Set method is sufficient.
Epic: None
Release note: None