Skip to content

delete description about special non-reserved keywords that might still require special treatment (#21116) #21121

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

Closed
ti-chi-bot wants to merge 1 commit into from
Closed

delete description about special non-reserved keywords that might still require special treatment (#21116) #21121

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion keywords.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@ summary: Keywords and Reserved Words

This article introduces the keywords in TiDB, the differences between reserved words and non-reserved words and summarizes all keywords for the query.

<<<<<<< HEAD
Keywords are words that have special meanings in SQL statements, such as `SELECT`, `UPDATE`, and `DELETE`. Some of them can be used as identifiers directly, which are called **non-reserved keywords**. Some of them require special treatment before being used as identifiers, which are called **reserved keywords**. However, there are special non-reserved keywords that might still require special treatment. It is recommended that you treat them as reserved keywords.
=======
Keywords are words that have special meanings in SQL statements, such as [`SELECT`](/sql-statements/sql-statement-select.md), [`UPDATE`](/sql-statements/sql-statement-update.md), and [`DELETE`](/sql-statements/sql-statement-delete.md). Some of them can be used as identifiers directly, which are called **non-reserved keywords**. Some of them require special treatment before being used as identifiers, which are called **reserved keywords**.
>>>>>>> 3dc620c9c9 (delete description about special non-reserved keywords that might still require special treatment (#21116))
Comment on lines +10 to +14
Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist bot Jun 4, 2025

Choose a reason for hiding this comment

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

critical

It appears there's a merge conflict in this section, indicated by the <<<<<<< HEAD, =======, and >>>>>>> markers. This makes the document incorrectly formatted and unreadable here.

Based on the PR's intent (to delete the description about special non-reserved keywords and use the updated text from the cherry-picked commit, which also includes helpful links for SELECT, UPDATE, and DELETE), the content introduced by the cherry-pick (the part after =======) should be retained.

Could you please resolve this conflict? The suggestion below provides the intended clean text for this paragraph.

Style Guide References

Suggested change
<<<<<<< HEAD
Keywords are words that have special meanings in SQL statements, such as `SELECT`, `UPDATE`, and `DELETE`. Some of them can be used as identifiers directly, which are called **non-reserved keywords**. Some of them require special treatment before being used as identifiers, which are called **reserved keywords**. However, there are special non-reserved keywords that might still require special treatment. It is recommended that you treat them as reserved keywords.
=======
Keywords are words that have special meanings in SQL statements, such as [`SELECT`](/sql-statements/sql-statement-select.md), [`UPDATE`](/sql-statements/sql-statement-update.md), and [`DELETE`](/sql-statements/sql-statement-delete.md). Some of them can be used as identifiers directly, which are called **non-reserved keywords**. Some of them require special treatment before being used as identifiers, which are called **reserved keywords**.
>>>>>>> 3dc620c9c9 (delete description about special non-reserved keywords that might still require special treatment (#21116))
Keywords are words that have special meanings in SQL statements, such as [`SELECT`](/sql-statements/sql-statement-select.md), [`UPDATE`](/sql-statements/sql-statement-update.md), and [`DELETE`](/sql-statements/sql-statement-delete.md). Some of them can be used as identifiers directly, which are called **non-reserved keywords**. Some of them require special treatment before being used as identifiers, which are called **reserved keywords**.


To use the reserved keywords as identifiers, you must enclose them in backticks `` ` ``:

Expand Down Expand Up @@ -59,7 +63,7 @@ Starting from v7.5.3, TiDB provides a full list of keywords in the [`INFORMATION

## Keyword list

The following list shows the keywords in TiDB. Reserved keywords are marked with `(R)`. Reserved keywords for [Window Functions](/functions-and-operators/window-functions.md) are marked with `(R-Window)`. Special non-reserved keywords that need to be escaped with backticks `` ` `` are marked with `(S)`.
The following list shows the keywords in TiDB. Reserved keywords are marked with `(R)`. Reserved keywords for [Window Functions](/functions-and-operators/window-functions.md) are marked with `(R-Window)`.

<TabsPanel letters="ABCDEFGHIJKLMNOPQRSTUVWXYZ" />

Expand Down