init

.husky/commit-msg

@@ -1,6 +0,0 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
-echo 'commitlint'
-
-npx --no -- commitlint --edit

.husky/pre-commit

@@ -1,4 +0,0 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
-npx lint-staged

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "dt-sql-parser",
+  "name": "dt-sql-parser-oushudb",
   "version": "4.0.1",
   "authors": "DTStack Corporation",
   "description": "SQL Parsers for BigData, built with antlr4",

src/grammar/postgresql/PostgreSqlLexer.g4

@@ -670,6 +670,10 @@ KW_SKIP_LOCKED        : 'SKIP_LOCKED';
 KW_BUFFER_USAGE_LIMIT : 'BUFFER_USAGE_LIMIT';
 //
 
+// My custom keywords
+KW_DISTRIBUTED : 'DISTRIBUTED';
+//
+
 // IDENTIFIERS (4.1.1)
 
 //

src/grammar/postgresql/PostgreSqlParser.g4

@@ -730,6 +730,10 @@ createstmt
     ) # columnCreateTable
     ;
 
+optdistributed
+    : KW_DISTRIBUTED KW_BY OPEN_PAREN column_list CLOSE_PAREN
+    ;
+
 opttemp
     : KW_TEMPORARY
     | KW_TEMP

src/lib/postgresql/PostgreSqlLexer.tokens

@@ -546,48 +546,49 @@ KW_EXTENDED=545
 KW_MAIN=546
 KW_SKIP_LOCKED=547
 KW_BUFFER_USAGE_LIMIT=548
-Identifier=549
-QuotedIdentifier=550
-UnterminatedQuotedIdentifier=551
-InvalidQuotedIdentifier=552
-InvalidUnterminatedQuotedIdentifier=553
-UnicodeQuotedIdentifier=554
-UnterminatedUnicodeQuotedIdentifier=555
-InvalidUnicodeQuotedIdentifier=556
-InvalidUnterminatedUnicodeQuotedIdentifier=557
-StringConstant=558
-UnterminatedStringConstant=559
-UnicodeEscapeStringConstant=560
-UnterminatedUnicodeEscapeStringConstant=561
-BeginDollarStringConstant=562
-BinaryStringConstant=563
-UnterminatedBinaryStringConstant=564
-InvalidBinaryStringConstant=565
-InvalidUnterminatedBinaryStringConstant=566
-HexadecimalStringConstant=567
-UnterminatedHexadecimalStringConstant=568
-InvalidHexadecimalStringConstant=569
-InvalidUnterminatedHexadecimalStringConstant=570
-Integral=571
-NumericFail=572
-Numeric=573
-PLSQLVARIABLENAME=574
-PLSQLIDENTIFIER=575
-Whitespace=576
-Newline=577
-LineComment=578
-BlockComment=579
-UnterminatedBlockComment=580
-MetaCommand=581
-EndMetaCommand=582
-ErrorCharacter=583
-EscapeStringConstant=584
-UnterminatedEscapeStringConstant=585
-InvalidEscapeStringConstant=586
-InvalidUnterminatedEscapeStringConstant=587
-DollarText=588
-EndDollarStringConstant=589
-AfterEscapeStringConstantWithNewlineMode_Continued=590
+KW_DISTRIBUTED=549
+Identifier=550
+QuotedIdentifier=551
+UnterminatedQuotedIdentifier=552
+InvalidQuotedIdentifier=553
+InvalidUnterminatedQuotedIdentifier=554
+UnicodeQuotedIdentifier=555
+UnterminatedUnicodeQuotedIdentifier=556
+InvalidUnicodeQuotedIdentifier=557
+InvalidUnterminatedUnicodeQuotedIdentifier=558
+StringConstant=559
+UnterminatedStringConstant=560
+UnicodeEscapeStringConstant=561
+UnterminatedUnicodeEscapeStringConstant=562
+BeginDollarStringConstant=563
+BinaryStringConstant=564
+UnterminatedBinaryStringConstant=565
+InvalidBinaryStringConstant=566
+InvalidUnterminatedBinaryStringConstant=567
+HexadecimalStringConstant=568
+UnterminatedHexadecimalStringConstant=569
+InvalidHexadecimalStringConstant=570
+InvalidUnterminatedHexadecimalStringConstant=571
+Integral=572
+NumericFail=573
+Numeric=574
+PLSQLVARIABLENAME=575
+PLSQLIDENTIFIER=576
+Whitespace=577
+Newline=578
+LineComment=579
+BlockComment=580
+UnterminatedBlockComment=581
+MetaCommand=582
+EndMetaCommand=583
+ErrorCharacter=584
+EscapeStringConstant=585
+UnterminatedEscapeStringConstant=586
+InvalidEscapeStringConstant=587
+InvalidUnterminatedEscapeStringConstant=588
+DollarText=589
+EndDollarStringConstant=590
+AfterEscapeStringConstantWithNewlineMode_Continued=591
 '$'=1
 '('=2
 ')'=3
@@ -1134,5 +1135,6 @@ AfterEscapeStringConstantWithNewlineMode_Continued=590
 'MAIN'=546
 'SKIP_LOCKED'=547
 'BUFFER_USAGE_LIMIT'=548
-'\\\\'=582
-'\''=590
+'DISTRIBUTED'=549
+'\\\\'=583
+'\''=591

src/lib/postgresql/PostgreSqlParser.tokens

@@ -546,48 +546,49 @@ KW_EXTENDED=545
 KW_MAIN=546
 KW_SKIP_LOCKED=547
 KW_BUFFER_USAGE_LIMIT=548
-Identifier=549
-QuotedIdentifier=550
-UnterminatedQuotedIdentifier=551
-InvalidQuotedIdentifier=552
-InvalidUnterminatedQuotedIdentifier=553
-UnicodeQuotedIdentifier=554
-UnterminatedUnicodeQuotedIdentifier=555
-InvalidUnicodeQuotedIdentifier=556
-InvalidUnterminatedUnicodeQuotedIdentifier=557
-StringConstant=558
-UnterminatedStringConstant=559
-UnicodeEscapeStringConstant=560
-UnterminatedUnicodeEscapeStringConstant=561
-BeginDollarStringConstant=562
-BinaryStringConstant=563
-UnterminatedBinaryStringConstant=564
-InvalidBinaryStringConstant=565
-InvalidUnterminatedBinaryStringConstant=566
-HexadecimalStringConstant=567
-UnterminatedHexadecimalStringConstant=568
-InvalidHexadecimalStringConstant=569
-InvalidUnterminatedHexadecimalStringConstant=570
-Integral=571
-NumericFail=572
-Numeric=573
-PLSQLVARIABLENAME=574
-PLSQLIDENTIFIER=575
-Whitespace=576
-Newline=577
-LineComment=578
-BlockComment=579
-UnterminatedBlockComment=580
-MetaCommand=581
-EndMetaCommand=582
-ErrorCharacter=583
-EscapeStringConstant=584
-UnterminatedEscapeStringConstant=585
-InvalidEscapeStringConstant=586
-InvalidUnterminatedEscapeStringConstant=587
-DollarText=588
-EndDollarStringConstant=589
-AfterEscapeStringConstantWithNewlineMode_Continued=590
+KW_DISTRIBUTED=549
+Identifier=550
+QuotedIdentifier=551
+UnterminatedQuotedIdentifier=552
+InvalidQuotedIdentifier=553
+InvalidUnterminatedQuotedIdentifier=554
+UnicodeQuotedIdentifier=555
+UnterminatedUnicodeQuotedIdentifier=556
+InvalidUnicodeQuotedIdentifier=557
+InvalidUnterminatedUnicodeQuotedIdentifier=558
+StringConstant=559
+UnterminatedStringConstant=560
+UnicodeEscapeStringConstant=561
+UnterminatedUnicodeEscapeStringConstant=562
+BeginDollarStringConstant=563
+BinaryStringConstant=564
+UnterminatedBinaryStringConstant=565
+InvalidBinaryStringConstant=566
+InvalidUnterminatedBinaryStringConstant=567
+HexadecimalStringConstant=568
+UnterminatedHexadecimalStringConstant=569
+InvalidHexadecimalStringConstant=570
+InvalidUnterminatedHexadecimalStringConstant=571
+Integral=572
+NumericFail=573
+Numeric=574
+PLSQLVARIABLENAME=575
+PLSQLIDENTIFIER=576
+Whitespace=577
+Newline=578
+LineComment=579
+BlockComment=580
+UnterminatedBlockComment=581
+MetaCommand=582
+EndMetaCommand=583
+ErrorCharacter=584
+EscapeStringConstant=585
+UnterminatedEscapeStringConstant=586
+InvalidEscapeStringConstant=587
+InvalidUnterminatedEscapeStringConstant=588
+DollarText=589
+EndDollarStringConstant=590
+AfterEscapeStringConstantWithNewlineMode_Continued=591
 '$'=1
 '('=2
 ')'=3
@@ -1134,5 +1135,6 @@ AfterEscapeStringConstantWithNewlineMode_Continued=590
 'MAIN'=546
 'SKIP_LOCKED'=547
 'BUFFER_USAGE_LIMIT'=548
-'\\\\'=582
-'\''=590
+'DISTRIBUTED'=549
+'\\\\'=583
+'\''=591

src/lib/postgresql/PostgreSqlParserListener.ts

@@ -103,6 +103,7 @@ import { Copy_generic_opt_argContext } from "./PostgreSqlParser.js";
 import { Copy_generic_opt_arg_listContext } from "./PostgreSqlParser.js";
 import { Copy_generic_opt_arg_list_itemContext } from "./PostgreSqlParser.js";
 import { ColumnCreateTableContext } from "./PostgreSqlParser.js";
+import { OptdistributedContext } from "./PostgreSqlParser.js";
 import { OpttempContext } from "./PostgreSqlParser.js";
 import { Table_column_listContext } from "./PostgreSqlParser.js";
 import { OpttableelementlistContext } from "./PostgreSqlParser.js";
@@ -1852,6 +1853,16 @@ export class PostgreSqlParserListener implements ParseTreeListener {
      * @param ctx the parse tree
      */
     exitColumnCreateTable?: (ctx: ColumnCreateTableContext) => void;
+    /**
+     * Enter a parse tree produced by `PostgreSqlParser.optdistributed`.
+     * @param ctx the parse tree
+     */
+    enterOptdistributed?: (ctx: OptdistributedContext) => void;
+    /**
+     * Exit a parse tree produced by `PostgreSqlParser.optdistributed`.
+     * @param ctx the parse tree
+     */
+    exitOptdistributed?: (ctx: OptdistributedContext) => void;
     /**
      * Enter a parse tree produced by `PostgreSqlParser.opttemp`.
      * @param ctx the parse tree

src/lib/postgresql/PostgreSqlParserVisitor.ts

@@ -103,6 +103,7 @@ import { Copy_generic_opt_argContext } from "./PostgreSqlParser.js";
 import { Copy_generic_opt_arg_listContext } from "./PostgreSqlParser.js";
 import { Copy_generic_opt_arg_list_itemContext } from "./PostgreSqlParser.js";
 import { ColumnCreateTableContext } from "./PostgreSqlParser.js";
+import { OptdistributedContext } from "./PostgreSqlParser.js";
 import { OpttempContext } from "./PostgreSqlParser.js";
 import { Table_column_listContext } from "./PostgreSqlParser.js";
 import { OpttableelementlistContext } from "./PostgreSqlParser.js";
@@ -1473,6 +1474,12 @@ export class PostgreSqlParserVisitor<Result> extends AbstractParseTreeVisitor<Re
      * @return the visitor result
      */
     visitColumnCreateTable?: (ctx: ColumnCreateTableContext) => Result;
+    /**
+     * Visit a parse tree produced by `PostgreSqlParser.optdistributed`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitOptdistributed?: (ctx: OptdistributedContext) => Result;
     /**
      * Visit a parse tree produced by `PostgreSqlParser.opttemp`.
      * @param ctx the parse tree