Skip to content

Commit 4736a65

Browse files
zhaogeHaydenOrz
authored andcommitted
feat(pgsql: upgrade rules' name): pgsql: upgrade rules' name
1 parent 55379f3 commit 4736a65

8 files changed

Lines changed: 18564 additions & 20109 deletions

File tree

src/grammar/pgsql/PostgreSQLLexer.g4

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -643,6 +643,8 @@ KW_ASSERT: 'ASSERT';
643643
KW_LOOP: 'LOOP';
644644
KW_OPEN: 'OPEN';
645645

646+
//16.x new keywords
647+
646648
KW_PEFERENCES: 'PEFERENCES';
647649
KW_USAGE: 'USAGE';
648650
KW_CONNECT: 'CONNECT';

src/grammar/pgsql/PostgreSQLParser.g4

Lines changed: 230 additions & 293 deletions
Large diffs are not rendered by default.

src/lib/pgsql/PostgreSQLParser.interp

Lines changed: 25 additions & 29 deletions
Large diffs are not rendered by default.

src/lib/pgsql/PostgreSQLParser.ts

Lines changed: 18084 additions & 19484 deletions
Large diffs are not rendered by default.

src/lib/pgsql/PostgreSQLParserListener.ts

Lines changed: 120 additions & 168 deletions
Large diffs are not rendered by default.

src/lib/pgsql/PostgreSQLParserVisitor.ts

Lines changed: 72 additions & 104 deletions
Large diffs are not rendered by default.

src/parser/pgsql.ts

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,18 @@ export default class PostgresSQL extends BasicParser<
2121
}
2222

2323
protected preferredRules: Set<number> = new Set([
24-
PostgreSQLParser.RULE_createTableName, // table name
25-
PostgreSQLParser.RULE_tableName, // table name that will be created
26-
PostgreSQLParser.RULE_funcName, // function name
27-
PostgreSQLParser.RULE_createFuncName, // function name that will be created
28-
PostgreSQLParser.RULE_createSchemaName, // schema name that will be created
29-
PostgreSQLParser.RULE_schemaName, // schema name
30-
PostgreSQLParser.RULE_createViewName, // view name that will be created
31-
PostgreSQLParser.RULE_viewName, // view name
32-
PostgreSQLParser.RULE_createDatabaseName, // database name that will be created
33-
PostgreSQLParser.RULE_databaseName, // database name
34-
PostgreSQLParser.RULE_createProcedureName, // procedure name that will be created
35-
PostgreSQLParser.RULE_procedureName, // procedure name
24+
PostgreSQLParser.RULE_table_name_create, // table name
25+
PostgreSQLParser.RULE_table_name, // table name that will be created
26+
PostgreSQLParser.RULE_function_name, // function name
27+
PostgreSQLParser.RULE_function_name_create, // function name that will be created
28+
PostgreSQLParser.RULE_schema_name_create, // schema name that will be created
29+
PostgreSQLParser.RULE_schema_name, // schema name
30+
PostgreSQLParser.RULE_view_name_create, // view name that will be created
31+
PostgreSQLParser.RULE_view_name, // view name
32+
PostgreSQLParser.RULE_database_name_create, // database name that will be created
33+
PostgreSQLParser.RULE_database_name, // database name
34+
PostgreSQLParser.RULE_procedure_name_create, // procedure name that will be created
35+
PostgreSQLParser.RULE_procedure_name, // procedure name
3636
]);
3737

3838
protected get splitListener() {
@@ -57,51 +57,51 @@ export default class PostgresSQL extends BasicParser<
5757

5858
let syntaxContextType: SyntaxContextType;
5959
switch (ruleType) {
60-
case PostgreSQLParser.RULE_createTableName: {
60+
case PostgreSQLParser.RULE_table_name_create: {
6161
syntaxContextType = SyntaxContextType.TABLE_CREATE;
6262
break;
6363
}
64-
case PostgreSQLParser.RULE_tableName: {
64+
case PostgreSQLParser.RULE_table_name: {
6565
syntaxContextType = SyntaxContextType.TABLE;
6666
break;
6767
}
68-
case PostgreSQLParser.RULE_createFuncName: {
68+
case PostgreSQLParser.RULE_function_name_create: {
6969
syntaxContextType = SyntaxContextType.FUNCTION_CREATE;
7070
break;
7171
}
72-
case PostgreSQLParser.RULE_funcName: {
72+
case PostgreSQLParser.RULE_function_name: {
7373
syntaxContextType = SyntaxContextType.FUNCTION;
7474
break;
7575
}
76-
case PostgreSQLParser.RULE_createSchemaName: {
76+
case PostgreSQLParser.RULE_schema_name_create: {
7777
syntaxContextType = SyntaxContextType.DATABASE_CREATE;
7878
break;
7979
}
80-
case PostgreSQLParser.RULE_schemaName: {
80+
case PostgreSQLParser.RULE_schema_name: {
8181
syntaxContextType = SyntaxContextType.DATABASE;
8282
break;
8383
}
84-
case PostgreSQLParser.RULE_createViewName: {
84+
case PostgreSQLParser.RULE_view_name_create: {
8585
syntaxContextType = SyntaxContextType.VIEW_CREATE;
8686
break;
8787
}
88-
case PostgreSQLParser.RULE_viewName: {
88+
case PostgreSQLParser.RULE_view_name: {
8989
syntaxContextType = SyntaxContextType.VIEW;
9090
break;
9191
}
92-
case PostgreSQLParser.RULE_createDatabaseName: {
92+
case PostgreSQLParser.RULE_database_name_create: {
9393
syntaxContextType = SyntaxContextType.DATABASE_CREATE;
9494
break;
9595
}
96-
case PostgreSQLParser.RULE_databaseName: {
96+
case PostgreSQLParser.RULE_database_name: {
9797
syntaxContextType = SyntaxContextType.DATABASE;
9898
break;
9999
}
100-
case PostgreSQLParser.RULE_createProcedureName: {
100+
case PostgreSQLParser.RULE_procedure_name_create: {
101101
syntaxContextType = SyntaxContextType.PROCEDURE_CREATE;
102102
break;
103103
}
104-
case PostgreSQLParser.RULE_procedureName: {
104+
case PostgreSQLParser.RULE_procedure_name: {
105105
syntaxContextType = SyntaxContextType.PROCEDURE;
106106
break;
107107
}

test/parser/pgsql/suggestion/tokenSuggestion.test.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -158,14 +158,14 @@ describe('Postgres SQL Token Suggestion', () => {
158158
'TRIGGER',
159159
'POLICY',
160160
'SCHEMA',
161-
'ACCESS',
162-
'EVENT',
163-
'EXTENSION',
164-
'FOREIGN',
165-
'PROCEDURAL',
166-
'LANGUAGE',
167-
'PUBLICATION',
168161
'SERVER',
162+
'PUBLICATION',
163+
'LANGUAGE',
164+
'PROCEDURAL',
165+
'FOREIGN',
166+
'EXTENSION',
167+
'EVENT',
168+
'ACCESS',
169169
'TABLE',
170170
'SEQUENCE',
171171
'VIEW',

0 commit comments

Comments
 (0)