Add INSERT-related tokens, node types, and keyword table entries

New tokens: TK_DELAYED, TK_HIGH_PRIORITY, TK_DUPLICATE, TK_KEY,
TK_CONFLICT, TK_DO, TK_NOTHING, TK_RETURNING, TK_CONSTRAINT.
New node types: NODE_INSERT_STMT, NODE_INSERT_COLUMNS, NODE_VALUES_CLAUSE,
NODE_VALUES_ROW, NODE_INSERT_SET_CLAUSE, NODE_ON_DUPLICATE_KEY,
NODE_ON_CONFLICT, NODE_CONFLICT_TARGET, NODE_CONFLICT_ACTION,
NODE_RETURNING_CLAUSE, NODE_UPDATE_SET_ITEM, NODE_STMT_OPTIONS.
Updated is_alias_start() blocklist and keyword-as-identifier list.

Author: renecannao

include/sql_parser/common.h

@@ -143,6 +143,22 @@ enum class NodeType : uint16_t {
     NODE_BETWEEN,
     NODE_IN_LIST,
     NODE_CASE_WHEN,
+
+    // INSERT nodes
+    NODE_INSERT_STMT,
+    NODE_INSERT_COLUMNS,       // (col1, col2, ...)
+    NODE_VALUES_CLAUSE,        // VALUES keyword wrapper
+    NODE_VALUES_ROW,           // single (val1, val2, ...) row
+    NODE_INSERT_SET_CLAUSE,    // MySQL INSERT ... SET col=val form
+    NODE_ON_DUPLICATE_KEY,     // MySQL ON DUPLICATE KEY UPDATE
+    NODE_ON_CONFLICT,          // PostgreSQL ON CONFLICT
+    NODE_CONFLICT_TARGET,      // PostgreSQL conflict target (cols or ON CONSTRAINT)
+    NODE_CONFLICT_ACTION,      // DO UPDATE SET ... or DO NOTHING
+    NODE_RETURNING_CLAUSE,     // PostgreSQL RETURNING expr_list
+
+    // Shared
+    NODE_STMT_OPTIONS,         // LOW_PRIORITY, IGNORE, QUICK, DELAYED, etc.
+    NODE_UPDATE_SET_ITEM,      // single col=expr pair (shared by INSERT SET and UPDATE SET)
 };
 
 } // namespace sql_parser

include/sql_parser/expression_parser.h

@@ -440,6 +440,15 @@ class ExpressionParser {
             case TokenType::TK_SHARE:
             case TokenType::TK_DATA:
             case TokenType::TK_RESET:
+            case TokenType::TK_KEY:
+            case TokenType::TK_DO:
+            case TokenType::TK_NOTHING:
+            case TokenType::TK_CONFLICT:
+            case TokenType::TK_CONSTRAINT:
+            case TokenType::TK_RETURNING:
+            case TokenType::TK_DUPLICATE:
+            case TokenType::TK_DELAYED:
+            case TokenType::TK_HIGH_PRIORITY:
                 return true;
             default:
                 return false;

include/sql_parser/keywords_mysql.h

@@ -30,18 +30,23 @@ inline constexpr KeywordEntry KEYWORDS[] = {
     {"COLLATE", 7, TokenType::TK_COLLATE},
     {"COMMIT", 6, TokenType::TK_COMMIT},
     {"COMMITTED", 9, TokenType::TK_COMMITTED},
+    {"CONFLICT", 8, TokenType::TK_CONFLICT},
+    {"CONSTRAINT", 10, TokenType::TK_CONSTRAINT},
     {"COUNT", 5, TokenType::TK_COUNT},
     {"CREATE", 6, TokenType::TK_CREATE},
     {"CROSS", 5, TokenType::TK_CROSS},
     {"DATA", 4, TokenType::TK_DATA},
     {"DATABASE", 8, TokenType::TK_DATABASE},
     {"DEALLOCATE", 10, TokenType::TK_DEALLOCATE},
     {"DEFAULT", 7, TokenType::TK_DEFAULT},
+    {"DELAYED", 7, TokenType::TK_DELAYED},
     {"DELETE", 6, TokenType::TK_DELETE},
     {"DESC", 4, TokenType::TK_DESC},
     {"DISTINCT", 8, TokenType::TK_DISTINCT},
+    {"DO", 2, TokenType::TK_DO},
     {"DROP", 4, TokenType::TK_DROP},
     {"DUMPFILE", 8, TokenType::TK_DUMPFILE},
+    {"DUPLICATE", 9, TokenType::TK_DUPLICATE},
     {"ELSE", 4, TokenType::TK_ELSE},
     {"END", 3, TokenType::TK_END},
     {"EXECUTE", 7, TokenType::TK_EXECUTE},
@@ -55,6 +60,7 @@ inline constexpr KeywordEntry KEYWORDS[] = {
     {"GRANT", 5, TokenType::TK_GRANT},
     {"GROUP", 5, TokenType::TK_GROUP},
     {"HAVING", 6, TokenType::TK_HAVING},
+    {"HIGH_PRIORITY", 13, TokenType::TK_HIGH_PRIORITY},
     {"IF", 2, TokenType::TK_IF},
     {"IGNORE", 6, TokenType::TK_IGNORE},
     {"IN", 2, TokenType::TK_IN},
@@ -65,6 +71,7 @@ inline constexpr KeywordEntry KEYWORDS[] = {
     {"IS", 2, TokenType::TK_IS},
     {"ISOLATION", 9, TokenType::TK_ISOLATION},
     {"JOIN", 4, TokenType::TK_JOIN},
+    {"KEY", 3, TokenType::TK_KEY},
     {"LEFT", 4, TokenType::TK_LEFT},
     {"LEVEL", 5, TokenType::TK_LEVEL},
     {"LIKE", 4, TokenType::TK_LIKE},
@@ -79,6 +86,7 @@ inline constexpr KeywordEntry KEYWORDS[] = {
     {"NAMES", 5, TokenType::TK_NAMES},
     {"NATURAL", 7, TokenType::TK_NATURAL},
     {"NOT", 3, TokenType::TK_NOT},
+    {"NOTHING", 7, TokenType::TK_NOTHING},
     {"NOWAIT", 6, TokenType::TK_NOWAIT},
     {"NULL", 4, TokenType::TK_NULL},
     {"OF", 2, TokenType::TK_OF},
@@ -96,6 +104,7 @@ inline constexpr KeywordEntry KEYWORDS[] = {
     {"REPEATABLE", 10, TokenType::TK_REPEATABLE},
     {"REPLACE", 7, TokenType::TK_REPLACE},
     {"RESET", 5, TokenType::TK_RESET},
+    {"RETURNING", 9, TokenType::TK_RETURNING},
     {"REVOKE", 6, TokenType::TK_REVOKE},
     {"RIGHT", 5, TokenType::TK_RIGHT},
     {"ROLLBACK", 8, TokenType::TK_ROLLBACK},

include/sql_parser/keywords_pgsql.h

@@ -27,6 +27,8 @@ inline constexpr KeywordEntry KEYWORDS[] = {
     {"COLLATE", 7, TokenType::TK_COLLATE},
     {"COMMIT", 6, TokenType::TK_COMMIT},
     {"COMMITTED", 9, TokenType::TK_COMMITTED},
+    {"CONFLICT", 8, TokenType::TK_CONFLICT},
+    {"CONSTRAINT", 10, TokenType::TK_CONSTRAINT},
     {"COUNT", 5, TokenType::TK_COUNT},
     {"CREATE", 6, TokenType::TK_CREATE},
     {"CROSS", 5, TokenType::TK_CROSS},
@@ -37,6 +39,7 @@ inline constexpr KeywordEntry KEYWORDS[] = {
     {"DELETE", 6, TokenType::TK_DELETE},
     {"DESC", 4, TokenType::TK_DESC},
     {"DISTINCT", 8, TokenType::TK_DISTINCT},
+    {"DO", 2, TokenType::TK_DO},
     {"DROP", 4, TokenType::TK_DROP},
     {"ELSE", 4, TokenType::TK_ELSE},
     {"END", 3, TokenType::TK_END},
@@ -71,6 +74,7 @@ inline constexpr KeywordEntry KEYWORDS[] = {
     {"NAMES", 5, TokenType::TK_NAMES},
     {"NATURAL", 7, TokenType::TK_NATURAL},
     {"NOT", 3, TokenType::TK_NOT},
+    {"NOTHING", 7, TokenType::TK_NOTHING},
     {"NULL", 4, TokenType::TK_NULL},
     {"OF", 2, TokenType::TK_OF},
     {"OFFSET", 6, TokenType::TK_OFFSET},
@@ -83,6 +87,7 @@ inline constexpr KeywordEntry KEYWORDS[] = {
     {"READ", 4, TokenType::TK_READ},
     {"REPEATABLE", 10, TokenType::TK_REPEATABLE},
     {"RESET", 5, TokenType::TK_RESET},
+    {"RETURNING", 9, TokenType::TK_RETURNING},
     {"REVOKE", 6, TokenType::TK_REVOKE},
     {"RIGHT", 5, TokenType::TK_RIGHT},
     {"ROLLBACK", 8, TokenType::TK_ROLLBACK},

include/sql_parser/table_ref_parser.h

@@ -216,6 +216,11 @@ class TableRefParser {
             case TokenType::TK_VALUES:
             case TokenType::TK_SELECT:
             case TokenType::TK_DEFAULT:
+            case TokenType::TK_RETURNING:
+            case TokenType::TK_CONFLICT:
+            case TokenType::TK_DO:
+            case TokenType::TK_NOTHING:
+            case TokenType::TK_DUPLICATE:
                 return false;
             default:
                 return true;  // Keywords not in the blocklist can be implicit aliases

include/sql_parser/token.h

@@ -64,6 +64,17 @@ enum class TokenType : uint16_t {
     TK_UNION, TK_OF,
     TK_SQL_CALC_FOUND_ROWS,
     TK_COUNT, TK_SUM, TK_AVG, TK_MIN, TK_MAX,
+
+    // INSERT/REPLACE related tokens
+    TK_DELAYED,
+    TK_HIGH_PRIORITY,
+    TK_DUPLICATE,
+    TK_KEY,
+    TK_CONFLICT,
+    TK_DO,
+    TK_NOTHING,
+    TK_RETURNING,
+    TK_CONSTRAINT,
 };
 
 struct Token {