From 718d3204556a1bf6d09f577bf81a35b668be406e Mon Sep 17 00:00:00 2001
From: freemine <freemine@yeah.net>
Date: Mon, 23 Dec 2024 14:00:04 +0800
Subject: [PATCH] 1. make lemon warning as error, so that no syntax conflicts
 in sql.y exists 2. resolving joined_table syntax conflicts

---
 source/libs/parser/CMakeLists.txt | 2 +-
 source/libs/parser/inc/sql.y      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/libs/parser/CMakeLists.txt b/source/libs/parser/CMakeLists.txt
index bd2dd95ee0..088cdc4368 100644
--- a/source/libs/parser/CMakeLists.txt
+++ b/source/libs/parser/CMakeLists.txt
@@ -7,7 +7,7 @@ ENDIF()
 add_custom_command(
     OUTPUT ${TD_SOURCE_DIR}/source/libs/parser/src/sql.c ${TD_SOURCE_DIR}/include/common/ttokenauto.h
     COMMAND echo "Running lemon process in ${TD_SOURCE_DIR}/source/libs/parser/inc"
-    COMMAND ${TD_CONTRIB_DIR}/lemon/lemon sql.y || true
+    COMMAND ${TD_CONTRIB_DIR}/lemon/lemon sql.y
     COMMAND echo "copy sql.c from ${TD_SOURCE_DIR}/source/libs/parser/inc/sql.c to ${TD_SOURCE_DIR}/source/libs/parser/src/"
     COMMAND mv ${TD_SOURCE_DIR}/source/libs/parser/inc/sql.c ${TD_SOURCE_DIR}/source/libs/parser/src/sql.c
     COMMAND mv ${TD_SOURCE_DIR}/source/libs/parser/inc/sql.h ${TD_SOURCE_DIR}/include/common/ttokenauto.h
diff --git a/source/libs/parser/inc/sql.y b/source/libs/parser/inc/sql.y
index 63eb09d509..c1136e8280 100644
--- a/source/libs/parser/inc/sql.y
+++ b/source/libs/parser/inc/sql.y
@@ -1446,7 +1446,7 @@ parenthesized_joined_table(A) ::= NK_LP parenthesized_joined_table(B) NK_RP.
 
 /************************************************ joined_table ********************************************************/
 joined_table(A) ::=
-  table_reference(B) join_type(C) join_subtype(D) JOIN table_reference(E) join_on_clause_opt(F)
+  table_reference(B) join_type(C) join_subtype(D) JOIN table_primary(E) join_on_clause_opt(F)
   window_offset_clause_opt(G) jlimit_clause_opt(H).                               {
                                                                                     A = createJoinTableNode(pCxt, C, D, B, E, F);
                                                                                     A = addWindowOffsetClause(pCxt, A, G);