Skip to content

E021 parser fix #46

Merged
merged 4 commits into from
Mar 12, 2024
Merged

E021 parser fix #46

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7893de8
Add LENGTH functions rule to FirebirdParser
TedCraft Mar 11, 2024
62c78ce
Add CHAR VARYING data type to FirebirdParser
TedCraft Mar 11, 2024
4a2c39c
Add UPPER and LOWER functions to FirebirdParser
TedCraft Mar 12, 2024
e8ade23
Add proper trim function support to FirebirdParser
TedCraft Mar 12, 2024
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
7 changes: 5 additions & 2 deletions parser/sql/dialect/firebird/src/main/antlr4/imports/firebird/BaseRule.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,8 @@ extractFunction
;

trimFunction
: TRIM LP_ (LEADING | BOTH | TRAILING) STRING_ FROM STRING_ RP_
: TRIM LP_ ((LEADING | BOTH | TRAILING) expr? FROM)? expr RP_
| TRIM LP_ (expr FROM)? expr RP_
;

regularFunction
Expand All @@ -251,6 +252,8 @@ regularFunction

regularFunctionName
: identifier | IF | CURRENT_TIMESTAMP | LOCALTIME | LOCALTIMESTAMP | INTERVAL
| CHAR_LENGTH | CHARACTER_LENGTH | BIT_LENGTH | OCTET_LENGTH
| UPPER | LOWER
;

matchExpression
Expand Down Expand Up @@ -294,7 +297,7 @@ dataType
;

dataTypeName
: CHARACTER | CHARACTER VARYING | NATIONAL CHARACTER | NATIONAL CHARACTER VARYING | CHAR | VARCHAR | NCHAR
: CHARACTER | CHARACTER VARYING | CHAR VARYING | NATIONAL CHARACTER | NATIONAL CHARACTER VARYING | CHAR | VARCHAR | NCHAR
| NATIONAL CHAR | NATIONAL CHAR VARYING | BIT | BIT VARYING | NUMERIC | DECIMAL | DEC | INTEGER | SMALLINT
| FLOAT | REAL | DOUBLE PRECISION | DATE | TIME | TIMESTAMP | INTERVAL | TIME WITH TIME ZONE | TIMESTAMP WITH TIME ZONE
| identifier
Expand Down
Loading