Skip to content

Commit

Permalink
Merge pull request #167 from K2InformaticsGmbH/wwe_4.6.0
Browse files Browse the repository at this point in the history
Version 4.6.0

Former-commit-id: c8ed43817208b4638a10fcc6c91d2c8db4d686cf
  • Loading branch information
walter-weinmann authored Mar 18, 2019
2 parents b4694e1 + 451cd49 commit 77f2fcb
Show file tree
Hide file tree
Showing 17 changed files with 2,370 additions and 1,156 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
![GitHub](https://img.shields.io/github/license/K2InformaticsGmbH/sqlparse.svg)
![GitHub release](https://img.shields.io/github/release/K2InformaticsGmbH/sqlparse.svg)
![GitHub Release Date](https://img.shields.io/github/release-date/K2InformaticsGmbH/sqlparse.svg)
![GitHub commits since latest release](https://img.shields.io/github/commits-since/K2InformaticsGmbH/sqlparse/4.5.0.svg)
![GitHub commits since latest release](https://img.shields.io/github/commits-since/K2InformaticsGmbH/sqlparse/4.6.0.svg)

**sqlparse** is a production-ready SQL parser written in pure Erlang.
**sqlparse** is aligned to the Oracle SQL language and enriched with [imem](https://github.com/K2InformaticsGmbH/imem) and [JSONPath](https://github.com/K2InformaticsGmbH/jpparse) specific features.
Expand Down
107 changes: 104 additions & 3 deletions include/sql_lex.hrl
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,90 @@

-include("sqlparse.hrl").

%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% May not be used as identifier !!!
%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

-define(KEYWORDS, [
{"^(?i)(ALL)$", 'ALL'},
{"^(?i)(ALTER)$", 'ALTER'},
{"^(?i)(AND)$", 'AND'},
{"^(?i)(ANY)$", 'ANY'},
{"^(?i)(AS)$", 'AS'},
{"^(?i)(ASC)$", 'ASC'},
{"^(?i)(BETWEEN)$", 'BETWEEN'},
{"^(?i)(BY)$", 'BY'},
{"^(?i)(CASE)$", 'CASE'},
{"^(?i)(CHAR)$", 'CHAR'},
{"^(?i)(CHECK)$", 'CHECK'},
{"^(?i)(CLUSTER)$", 'CLUSTER'},
{"^(?i)(CONNECT)$", 'CONNECT'},
{"^(?i)(CREATE)$", 'CREATE'},
{"^(?i)(DATE)$", 'DATE'},
{"^(?i)(DEFAULT)$", 'DEFAULT'},
{"^(?i)(DELETE)$", 'DELETE'},
{"^(?i)(DESC)$", 'DESC'},
{"^(?i)(DISTINCT)$", 'DISTINCT'},
{"^(?i)(DROP)$", 'DROP'},
{"^(?i)(ELSE)$", 'ELSE'},
{"^(?i)(EXISTS)$", 'EXISTS'},
{"^(?i)(FLOAT)$", 'FLOAT'},
{"^(?i)(FROM)$", 'FROM'},
{"^(?i)(GRANT)$", 'GRANT'},
{"^(?i)(GROUP)$", 'GROUP'},
{"^(?i)(HAVING)$", 'HAVING'},
{"^(?i)(IDENTIFIED)$", 'IDENTIFIED'},
{"^(?i)(IN)$", 'IN'},
{"^(?i)(INDEX)$", 'INDEX'},
{"^(?i)(INSERT)$", 'INSERT'},
{"^(?i)(INTERSECT)$", 'INTERSECT'},
{"^(?i)(INTO)$", 'INTO'},
{"^(?i)(IS)$", 'IS'},
{"^(?i)(LIKE)$", 'LIKE'},
{"^(?i)(LONG)$", 'LONG'},
{"^(?i)(MINUS)$", 'MINUS'},
{"^(?i)(NOCYCLE)$", 'NOCYCLE'},
{"^(?i)(NOT)$", 'NOT'},
{"^(?i)(NULL)$", 'NULLX'},
{"^(?i)(NUMBER)$", 'NUMBER'},
{"^(?i)(OF)$", 'OF'},
{"^(?i)(ON)$", 'ON'},
{"^(?i)(OPTION)$", 'OPTION'},
{"^(?i)(OR)$", 'OR'},
{"^(?i)(ORDER)$", 'ORDER'},
{"^(?i)(PRIOR)$", 'PRIOR'},
{"^(?i)(PUBLIC)$", 'PUBLIC'},
{"^(?i)(RAW)$", 'RAW'},
{"^(?i)(REVOKE)$", 'REVOKE'},
{"^(?i)(SELECT)$", 'SELECT'},
{"^(?i)(SET)$", 'SET'},
{"^(?i)(SOME)$", 'SOME'},
{"^(?i)(START)$", 'START'},
{"^(?i)(SYNONYM)$", 'SYNONYM'},
{"^(?i)(TABLE)$", 'TABLE'},
{"^(?i)(TABLESPACE)$", 'TABLESPACE'},
{"^(?i)(TABLES)$", 'TABLES'},
{"^(?i)(TEMPORARY)$", 'TEMPORARY'},
{"^(?i)(THEN)$", 'THEN'},
{"^(?i)(THROUGH)$", 'THROUGH'},
{"^(?i)(TO)$", 'TO'},
{"^(?i)(TRIGGER)$", 'TRIGGER'},
{"^(?i)(TRUNCATE)$", 'TRUNCATE'},
{"^(?i)(UNION)$", 'UNION'},
{"^(?i)(UNIQUE)$", 'UNIQUE'},
{"^(?i)(UPDATE)$", 'UPDATE'},
{"^(?i)(USER)$", 'USER'},
{"^(?i)(VALUES)$", 'VALUES'},
{"^(?i)(VARCHAR2)$", 'VARCHAR2'},
{"^(?i)(VIEW)$", 'VIEW'},
{"^(?i)(WHERE)$", 'WHERE'},
{"^(?i)(WITH)$", 'WITH'}
]).

%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Includes all terminals.
%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

-define(TOKENPATTERNS, [
{"^(?i)((GO[\s\t]*TO))$", 'GOTO'},
{"^(?i)(ABS)$", 'FUNS'},
Expand All @@ -45,15 +129,21 @@
{"^(?i)(BAG)$", 'BAG'},
{"^(?i)(BEGIN)$", 'BEGIN'},
{"^(?i)(BETWEEN)$", 'BETWEEN'},
{"^(?i)(BFILE)$", 'BFILE'},
{"^(?i)(BINARY_DOUBLE)$", 'BINARY_DOUBLE'},
{"^(?i)(BINARY_FLOAT)$", 'BINARY_FLOAT'},
{"^(?i)(BITMAP)$", 'BITMAP'},
{"^(?i)(BLOB)$", 'BLOB'},
{"^(?i)(BODY)$", 'BODY'},
{"^(?i)(BOOL_AND)$", 'UFUN'},
{"^(?i)(BOOL_OR)$", 'UFUN'},
{"^(?i)(BY)$", 'BY'},
{"^(?i)(CALL)$", 'CALL'},
{"^(?i)(CASCADE)$", 'CASCADE'},
{"^(?i)(CASE)$", 'CASE'},
{"^(?i)(CHAR)$", 'CHAR'},
{"^(?i)(CHECK)$", 'CHECK'},
{"^(?i)(CLOB)$", 'CLOB'},
{"^(?i)(CLOSE)$", 'CLOSE'},
{"^(?i)(CLUSTER)$", 'CLUSTER'},
{"^(?i)(COMMIT)$", 'COMMIT'},
Expand All @@ -76,6 +166,7 @@
{"^(?i)(CURSOR)$", 'CURSOR'},
{"^(?i)(DATABASE)$", 'DATABASE'},
{"^(?i)(DATAFILES)$", 'DATAFILES'},
{"^(?i)(DATE)$", 'DATE'},
{"^(?i)(DECODE)$", 'FUNS'},
{"^(?i)(DEFAULT)$", 'DEFAULT'},
{"^(?i)(DEFERRED)$", 'DEFERRED'},
Expand All @@ -94,10 +185,10 @@
{"^(?i)(EXCEPT)$", 'EXCEPT'},
{"^(?i)(EXECUTE)$", 'EXECUTE'},
{"^(?i)(EXISTS)$", 'EXISTS'},
% {"^(?i)(EXPIRE)$", 'EXPIRE'},
{"^(?i)(EXTERNALLY)$", 'EXTERNALLY'},
{"^(?i)(FETCH)$", 'FETCH'},
{"^(?i)(FILTER_WITH)$", 'FILTER_WITH'},
{"^(?i)(FLOAT)$", 'FLOAT'},
{"^(?i)(FORCE)$", 'FORCE'},
{"^(?i)(FOREIGN)$", 'FOREIGN'},
{"^(?i)(FOUND)$", 'FOUND'},
Expand Down Expand Up @@ -133,6 +224,7 @@
{"^(?i)(LINK)$", 'LINK'},
{"^(?i)(LOCAL)$", 'LOCAL'},
{"^(?i)(LOG)$", 'LOG'},
{"^(?i)(LONG)$", 'LONG'},
{"^(?i)(LOWER)$", 'FUNS'},
{"^(?i)(LTRIM)$", 'FUNS'},
{"^(?i)(MATERIALIZED)$", 'MATERIALIZED'},
Expand All @@ -141,12 +233,16 @@
{"^(?i)(MIN)$", 'FUNS'},
{"^(?i)(MINUS)$", 'MINUS'},
{"^(?i)(NATURAL)$", 'NATURAL'},
{"^(?i)(NCHAR)$", 'NCHAR'},
{"^(?i)(NCLOB)$", 'NCLOB'},
{"^(?i)(NO)$", 'NO'},
{"^(?i)(NOCYCLE)$", 'NOCYCLE'},
{"^(?i)(NONE)$", 'NONE'},
{"^(?i)(NORM_WITH)$", 'NORM_WITH'},
{"^(?i)(NOT)$", 'NOT'},
{"^(?i)(NULL)$", 'NULLX'},
{"^(?i)(NUMBER)$", 'NUMBER'},
{"^(?i)(NVARCHAR2)$", 'NVARCHAR2'},
{"^(?i)(NVL)$", 'FUNS'},
{"^(?i)(OF)$", 'OF'},
{"^(?i)(ON)$", 'ON'},
Expand All @@ -158,7 +254,6 @@
{"^(?i)(ORDERED_SET)$", 'ORDERED_SET'},
{"^(?i)(OUTER)$", 'OUTER'},
{"^(?i)(PACKAGE)$", 'PACKAGE'},
% {"^(?i)(PASSWORD)$", 'PASSWORD'},
{"^(?i)(PARTITION)$", 'PARTITION'},
{"^(?i)(PRECISION)$", 'PRECISION'},
{"^(?i)(PRESERVE)$", 'PRESERVE'},
Expand All @@ -170,6 +265,7 @@
{"^(?i)(PUBLIC)$", 'PUBLIC'},
{"^(?i)(PURGE)$", 'PURGE'},
{"^(?i)(QUOTA)$", 'QUOTA'},
{"^(?i)(RAW)$", 'RAW'},
{"^(?i)(REAL)$", 'REAL'},
{"^(?i)(REFERENCES)$", 'REFERENCES'},
{"^(?i)(REGR_AVGX)$", 'FUNS'},
Expand All @@ -190,6 +286,7 @@
{"^(?i)(ROLE)$", 'ROLE'},
{"^(?i)(ROLES)$", 'ROLES'},
{"^(?i)(ROLLBACK)$", 'ROLLBACK'},
{"^(?i)(ROWID)$", 'ROWID'},
{"^(?i)(SCHEMA)$", 'SCHEMA'},
{"^(?i)(SELECT)$", 'SELECT'},
{"^(?i)(SELECTIVITY)$", 'UFUN'},
Expand All @@ -214,6 +311,7 @@
{"^(?i)(TEMPORARY)$", 'TEMPORARY'},
{"^(?i)(THEN)$", 'THEN'},
{"^(?i)(THROUGH)$", 'THROUGH'},
{"^(?i)(TIMESTAMP)$", 'TIMESTAMP'},
{"^(?i)(TO)$", 'TO'},
{"^(?i)(TO_CHAR)$", 'FUNS'},
{"^(?i)(TO_DATE)$", 'FUNS'},
Expand All @@ -226,20 +324,23 @@
{"^(?i)(UNLIMITED)$", 'UNLIMITED'},
{"^(?i)(UPDATE)$", 'UPDATE'},
{"^(?i)(UPPER)$", 'FUNS'},
{"^(?i)(UROWID)$", 'UROWID'},
{"^(?i)(USER)$", 'USER'},
{"^(?i)(USERS)$", 'USERS'},
{"^(?i)(USING)$", 'USING'},
{"^(?i)(VALIDATE)$", 'VALIDATE'},
{"^(?i)(VALUES)$", 'VALUES'},
{"^(?i)(VAR_POP)$", 'FUNS'},
{"^(?i)(VAR_SAMP)$", 'FUNS'},
{"^(?i)(VARCHAR2)$", 'VARCHAR2'},
{"^(?i)(VARIANCE)$", 'FUNS'},
{"^(?i)(VIEW)$", 'VIEW'},
{"^(?i)(WHEN)$", 'WHEN'},
{"^(?i)(WHENEVER)$", 'WHENEVER'},
{"^(?i)(WHERE)$", 'WHERE'},
{"^(?i)(WITH)$", 'WITH'},
{"^(?i)(WORK)$", 'WORK'}
{"^(?i)(WORK)$", 'WORK'},
{"^(?i)(XMLTYPE)$", 'XMLTYPE'}
]).

-endif.
2 changes: 1 addition & 1 deletion priv/bnf_converter/ParSqlparse.info.REMOVED.git-id
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1d8ad15cc55898ee04728418f2400980446f336f
471644b0110f1d68fb0a60fff44588d03901c6db
Loading

0 comments on commit 77f2fcb

Please sign in to comment.