Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/grammar/postgresql/PostgreSqlLexer.g4
Original file line number Diff line number Diff line change
Expand Up @@ -855,7 +855,7 @@ EndMetaCommand: '\\\\';
ErrorCharacter: .;

mode EscapeStringConstantMode;
EscapeStringConstant: EscapeStringText '\'' -> mode (AfterEscapeStringConstantMode);
EscapeStringConstant: EscapeStringText '\'' -> popMode;

UnterminatedEscapeStringConstant:
EscapeStringText
Expand All @@ -877,7 +877,7 @@ fragment EscapeStringText: (
| ~ ['\\]
)*;

InvalidEscapeStringConstant: InvalidEscapeStringText '\'' -> mode (AfterEscapeStringConstantMode);
InvalidEscapeStringConstant: InvalidEscapeStringText '\'' -> popMode;

InvalidUnterminatedEscapeStringConstant:
InvalidEscapeStringText
Expand Down
16 changes: 8 additions & 8 deletions src/grammar/postgresql/PostgreSqlParser.g4
Original file line number Diff line number Diff line change
Expand Up @@ -2354,14 +2354,11 @@ booleanExpression
;

predicate[antlr.ParserRuleContext value]
: comparisonOperator right= valueExpression # comparison
| comparisonOperator subqueryOperator subType (
selectWithParens
| OPEN_PAREN expression CLOSE_PAREN
) # quantifiedComparison
| KW_NOT? KW_BETWEEN lower= valueExpression KW_AND upper= valueExpression # between
| KW_NOT? KW_IN OPEN_PAREN expression (COMMA expression)* CLOSE_PAREN # inList
| KW_NOT? KW_IN selectWithParens # inSubquery
: comparisonOperator right= valueExpression # comparison
| subqueryOperator subType (selectWithParens | OPEN_PAREN expression CLOSE_PAREN) # quantifiedComparison
| KW_NOT? KW_BETWEEN lower= valueExpression KW_AND upper= valueExpression # between
| KW_NOT? KW_IN OPEN_PAREN expression (COMMA expression)* CLOSE_PAREN # inList
| KW_NOT? KW_IN selectWithParens # inSubquery
| KW_NOT? (KW_LIKE | KW_ILIKE | KW_SIMILAR KW_TO | KW_BETWEEN KW_SYMMETRIC?) pattern= valueExpression (
KW_ESCAPE escape= valueExpression
)? # like
Expand Down Expand Up @@ -2403,6 +2400,7 @@ primaryExpression
| row KW_OVERLAPS row
| columnNamePath
| primaryExpression TYPECAST typename
| primaryExpression collateClause
| (PLUS | MINUS) primaryExpression
| primaryExpression qualOp primaryExpression?
| primaryExpression mathOp primaryExpression
Expand Down Expand Up @@ -2554,6 +2552,8 @@ mathOp
| LESS_EQUALS
| GREATER_EQUALS
| NOT_EQUALS
| LESS_LESS
| GREATER_GREATER
;

qualOp
Expand Down
2 changes: 1 addition & 1 deletion src/lib/postgresql/PostgreSqlLexer.interp

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions src/lib/postgresql/PostgreSqlLexer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3221,14 +3221,14 @@ export class PostgreSqlLexer extends antlr.Lexer {
1,0,0,0,5805,5808,1,0,0,0,5806,5804,1,0,0,0,5807,5796,1,0,0,0,5807,
5800,1,0,0,0,5808,1214,1,0,0,0,5809,5811,5,36,0,0,5810,5812,3,1151,
573,0,5811,5810,1,0,0,0,5811,5812,1,0,0,0,5812,5813,1,0,0,0,5813,
5814,5,36,0,0,5814,5815,1,0,0,0,5815,5816,6,605,8,0,5816,1216,1,
5814,5,36,0,0,5814,5815,1,0,0,0,5815,5816,6,605,5,0,5816,1216,1,
0,0,0,74,0,1,2,3,4,1284,1290,1294,1296,1299,1301,1304,1308,1310,
1315,1320,5394,5400,5404,5408,5417,5419,5429,5431,5457,5459,5477,
5487,5498,5515,5533,5537,5540,5546,5549,5554,5558,5563,5570,5581,
5583,5598,5609,5617,5623,5626,5628,5634,5648,5656,5662,5665,5667,
5669,5675,5680,5685,5689,5697,5701,5703,5710,5713,5727,5751,5754,
5756,5766,5775,5777,5798,5804,5807,5811,9,7,29,0,3,0,0,5,1,0,5,4,
0,0,1,0,2,2,0,7,579,0,2,1,0,4,0,0
5756,5766,5775,5777,5798,5804,5807,5811,8,7,29,0,3,0,0,5,1,0,5,4,
0,0,1,0,4,0,0,7,579,0,2,1,0
];

private static __ATN: antlr.ATN;
Expand Down
2 changes: 1 addition & 1 deletion src/lib/postgresql/PostgreSqlParser.interp

Large diffs are not rendered by default.

Loading