Sync next to main

README-zh_CN.md

@@ -262,6 +262,18 @@ console.log(sqlSlices)
     [ 'CATALOG', 'FUNCTION', 'TEMPORARY', 'VIEW', 'DATABASE', 'TABLE' ] 
     */ 
     ```
+
+    可以通过可选的 `keywordFilter` 移除不需要的关键字候选项。返回 `true` 保留关键字，返回 `false` 移除关键字。
+
+    ```typescript
+    const sql = 'SELECT * FROM tb ';
+    const pos = { lineNumber: 1, column: sql.length + 1 };
+    const excludedKeywords = new Set(['WHERE', 'ORDER BY']);
+    const keywords = flink.getSuggestionAtCaretPosition(sql, pos, {
+        keywordFilter: (keyword) => !excludedKeywords.has(keyword),
+    })?.keywords;
+    ```
+
 + **获取语法相关自动补全信息**
     ```typescript
     import { FlinkSQL } from 'dt-sql-parser';

README.md

@@ -263,6 +263,18 @@ Call the `getAllEntities` method on the SQL instance, pass the SQL content and t
     [ 'CATALOG', 'FUNCTION', 'TEMPORARY', 'VIEW', 'DATABASE', 'TABLE' ] 
     */
     ```
+
+    Use the optional `keywordFilter` to remove unwanted keyword candidates. Return `true` to keep a keyword and `false` to remove it.
+
+    ```typescript
+    const sql = 'SELECT * FROM tb ';
+    const pos = { lineNumber: 1, column: sql.length + 1 };
+    const excludedKeywords = new Set(['WHERE', 'ORDER BY']);
+    const keywords = flink.getSuggestionAtCaretPosition(sql, pos, {
+        keywordFilter: (keyword) => !excludedKeywords.has(keyword),
+    })?.keywords;
+    ```
+
 +  **Obtaining information related to grammar completion**
     ```javascript
     import { FlinkSQL } from 'dt-sql-parser';

src/grammar/mysql/MySqlParser.g4

@@ -1071,7 +1071,7 @@ orderByClause
     ;
 
 orderByExpression
-    : expression order=(KW_ASC | KW_DESC)?
+    : (expression | columnNamePathAllowEmpty) order=(KW_ASC | KW_DESC)?
     ;
 
 tableSources
@@ -1258,15 +1258,15 @@ groupByClause
     ;
 
 havingClause
-    : KW_HAVING havingExpr=expression
+    : KW_HAVING (havingExpr=expression | columnNamePathAllowEmpty)
     ;
 
 windowClause
     : KW_WINDOW windowName KW_AS '(' windowSpec ')' (',' windowName KW_AS '(' windowSpec ')')*
     ;
 
 groupByItem
-    : expression order=(KW_ASC | KW_DESC)?
+    : (expression | columnNamePathAllowEmpty) order=(KW_ASC | KW_DESC)?
     ;
 
 limitClause
@@ -2431,13 +2431,14 @@ columnName
     ;
 
 columnNamePath
-    : uid (dottedId dottedId?)?
-    | .? dottedId dottedId?
+    : uid (dottedId dottedId?)?                      # columnNamePath_default
+    | .? dottedId dottedId?                          # columnNamePath_dotted
+    | uid DOT {this.shouldMatchEmpty()}? emptyColumn # columnNamePath_dot_empty
     ;
 
 columnNamePathAllowEmpty
-    : {this.shouldMatchEmpty()}? emptyColumn
-    | uid (dottedId dottedId?)?
+    : columnNamePath
+    | {this.shouldMatchEmpty()}? emptyColumn
     ;
 
 tableSpaceNameCreate

src/grammar/postgresql/PostgreSqlParser.g4

@@ -40,6 +40,17 @@ options {
     superClass=SQLParserBase;
 }
 
+@parser::members {
+    isFollowedByInto(): boolean {
+        return this.tokenStream.LA(1) === PostgreSqlParser.KW_INTO;
+    }
+
+    isFollowedByEnd(): boolean {
+        const la = this.tokenStream.LA(1);
+        return la === PostgreSqlParser.SEMI || la === PostgreSqlParser.EOF;
+    }
+}
+
 @header {
 import { SQLParserBase } from '../SQLParserBase';
 }
@@ -2629,7 +2640,8 @@ optIndirection
     ;
 
 targetList
-    : targetEl (COMMA targetEl)*
+    : {this.isFollowedByInto() || this.isFollowedByEnd()}?
+    | targetEl (COMMA targetEl)*
     ;
 
 targetEl
@@ -2735,7 +2747,8 @@ columnName
     ;
 
 columnNamePath
-    : colId optIndirection
+    : colId optIndirection                             # columnNamePath_default
+    | colId DOT {this.shouldMatchEmpty()}? emptyColumn # columnNamePath_dot_empty
     ;
 
 columnNameCreate
@@ -3628,5 +3641,5 @@ anyIdentifier
     ;
 
 sqlExpression
-    : targetList? intoClause? fromClause? whereClause? groupClause? havingClause? windowClause?
+    : targetList intoClause? fromClause? whereClause? groupClause? havingClause? windowClause?
     ;

src/grammar/trino/TrinoSql.g4

@@ -29,6 +29,12 @@ options {
     superClass=SQLParserBase;
 }
 
+@parser::members {
+    notEntityCollecting(): boolean {
+        return !this.entityCollecting;
+    }
+}
+
 @header {
 import { SQLParserBase } from '../SQLParserBase';
 }
@@ -380,10 +386,19 @@ joinType
     ;
 
 joinCriteria
-    : KW_ON booleanExpression
+    : KW_ON (joinColumnEquality | {this.notEntityCollecting()}? booleanExpression)
     | KW_USING '(' identifier (',' identifier)* ')'
     ;
 
+joinColumnEquality
+    : left=joinColumnReference EQ right=joinColumnReference
+    ;
+
+joinColumnReference
+    : identifier DOT {this.entityCollecting}? emptyColumn
+    | columnName
+    ;
+
 sampledRelation
     : patternRecognition (KW_TABLESAMPLE sampleType '(' percentage=expression ')')?
     ;
@@ -1039,6 +1054,10 @@ columnRef
     | {this.shouldMatchEmpty()}?
     ;
 
+emptyColumn
+    :
+    ;
+
 columnName
     : qualifiedName
     ;

src/index.ts

@@ -32,7 +32,12 @@ export { EntityContextType } from './parser/common/types';
 
 export { StmtContextType } from './parser/common/entityCollector';
 
-export type { CaretPosition, Suggestions, SyntaxSuggestion } from './parser/common/types';
+export type {
+    CaretPosition,
+    SuggestionOptions,
+    Suggestions,
+    SyntaxSuggestion,
+} from './parser/common/types';
 
 export type { WordRange, TextSlice } from './parser/common/textAndWord';