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.

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

release-22.2: parser: add QUERY to bare_label_keyword #97156

Merged
merged 1 commit into from
Feb 16, 2023

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Feb 15, 2023

Backport 1/1 commits from #97041 on behalf of @ZhouXing19.

/cc @cockroachdb/release


As revealed by #84309, some keywords not added to bare_label_keywords in sql.y make the SELECT ... <keyword> statement error out, which is not compatible with postgres. This commit is to add the QUERY keyword per a support ticket. We're not adding the whole unreserved_keyword list here as having some of them in bare_label_keyword, such as DAY, brings reduce errors.

Postgres:

postgres=# select substring('stringstringstring',1,10) query;
   query
------------
 stringstri
(1 row)

CRDB:

root@localhost:26257/defaultdb> select substring('stringstringstring',1,10)  query;
invalid syntax: statement ignored: at or near "query": syntax error
SQLSTATE: 42601
DETAIL: source SQL:
select substring('stringstringstring',1,10)  query
                                             ^

informs #84309

Release Note(bug fix): fixed the syntax error for SELECT ... QUERY (without AS) statement.


Release justification: bug fix

As revealed by #84309, some keywords not added to `bare_label_keywords` in
`sql.y` will make the `SELECT ... <keyword>` statement error out, which is not
compatible with postgres. This commit is to add the `QUERY` keyword per a
support ticket. We're not adding the whole `unreserved_keyword` list here as
having some of them in `bare_label_keyword`, such as `DAY`, bring `reduce`
errors.

Postgres:

```
postgres=# select substring('stringstringstring',1,10) query;
   query
------------
 stringstri
(1 row)
```

CRDB:

```
root@localhost:26257/defaultdb> select substring('stringstringstring',1,10)  query;
invalid syntax: statement ignored: at or near "query": syntax error
SQLSTATE: 42601
DETAIL: source SQL:
select substring('stringstringstring',1,10)  query
                                             ^
```

informs #84309

Release Note(bug fix): fixed the syntax error for `SELECT ... QUERY` (without AS)
statement.
@blathers-crl blathers-crl bot requested a review from a team as a code owner February 15, 2023 03:42
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-22.2-97041 branch from beefc65 to acfbf02 Compare February 15, 2023 03:42
@blathers-crl
Copy link
Author

blathers-crl bot commented Feb 15, 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 blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Feb 15, 2023
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@ZhouXing19 ZhouXing19 merged commit 9db52f3 into release-22.2 Feb 16, 2023
@ZhouXing19 ZhouXing19 deleted the blathers/backport-release-22.2-97041 branch February 16, 2023 18:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants