Skip to content
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

release-23.2: sql: disallow invocation of procedures outside of CALL #112789

Merged
merged 2 commits into from
Oct 20, 2023
Merged

release-23.2: sql: disallow invocation of procedures outside of CALL #112789

merged 2 commits into from
Oct 20, 2023

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Oct 20, 2023 •
edited by mgartner
Loading

Backport 2/2 commits from #112690 on behalf of @mgartner.

/cc @cockroachdb/release

sql: disallow invocation of procedures outside of CALL

This commit adds some missing checks to ensure that procedures cannot be
invoked in any context besides as the root expression in CALL
statements.

Epic: CRDB-25388

Release note: None

sql: add tests with function invocation in procedure argument

This commit adds a couple of tests that show that functions can be used
in procedure argument expressions.

Release note: None

Release justification: Minor bug fixes for new features.

@mgartner
sql: disallow invocation of procedures outside of CALL
539baa2 
This commit adds some missing checks to ensure that procedures cannot be
invoked in any context besides as the root expression in `CALL`
statements.

Release note: None
@mgartner
sql: add tests with function invocation in procedure argument
f559fec 
This commit adds a couple of tests that show that functions can be used
in procedure argument expressions.

Release note: None
@blathers-crl blathers-crl bot requested review from a team as code owners October 20, 2023 19:53
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.2-112690 branch from 539baa2 to 1f9d900 Compare October 20, 2023 19:53
@blathers-crl blathers-crl bot requested review from mgartner and removed request for a team October 20, 2023 19:53
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Oct 20, 2023
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.2-112690 branch from 0d20b06 to f559fec Compare October 20, 2023 19:53
@blathers-crl
Copy link
Author

blathers-crl bot commented Oct 20, 2023

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Patches should only be created for serious issues or test-only changes.
  • Patches should not break backwards-compatibility.
  • Patches should change as little code as possible.
  • Patches should not change on-disk formats or node communication protocols.
  • Patches should not add new functionality.
  • Patches must not add, edit, or otherwise modify cluster versions; or add version gates.
If some of the basic criteria cannot be satisfied, ensure that the exceptional criteria are satisfied within.
  • There is a high priority need for the functionality that cannot wait until the next release and is difficult to address in another way.
  • The new functionality is additive-only and only runs for clusters which have specifically “opted in” to it (e.g. by a cluster setting).
  • New code is protected by a conditional check that is trivial to verify and ensures that it only runs for opt-in clusters.
  • The PM and TL on the team that owns the changed code have signed off that the change obeys the above rules.

Add a brief release justification to the body of your PR to justify this backport.

Some other things to consider:

  • What did we do to ensure that a user that doesn’t know & care about this backport, has no idea that it happened?
  • Will this work in a cluster of mixed patch versions? Did we test that?
  • If a user upgrades a patch version, uses this feature, and then downgrades, what happens?

@blathers-crl blathers-crl bot added the backport Label PR's that are backports to older release branches label Oct 20, 2023
@cockroach-teamcity
Copy link
Member

This change is Reviewable

michae2
michae2 approved these changes Oct 20, 2023
View reviewed changes
Copy link
Collaborator

@michae2 michae2 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewed 6 of 6 files at r1, 1 of 1 files at r2, all commit messages.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @DrewKimball, @mgartner, and @rharding6373)

@mgartner mgartner merged commit c309d64 into release-23.2 Oct 20, 2023
2 checks passed
@mgartner mgartner deleted the blathers/backport-release-23.2-112690 branch October 20, 2023 21:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@michae2 michae2 michae2 approved these changes

@mgartner mgartner Awaiting requested review from mgartner mgartner is a code owner automatically assigned from cockroachdb/sql-queries-prs

@DrewKimball DrewKimball Awaiting requested review from DrewKimball

@rharding6373 rharding6373 Awaiting requested review from rharding6373

Assignees

@mgartner mgartner

Labels
backport Label PR's that are backports to older release branches blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@cockroach-teamcity @michae2 @mgartner