Commit c29ba981 authored by Peter Eisentraut's avatar Peter Eisentraut

Update SQL keywords list to SQL:2016

Per previous convention (see
ace397e9), drop SQL:2008 and only keep
the latest two standards and SQL-92.

Note: SQL:2016-2 lists a large number of non-reserved keywords that
are really just information_schema column names related to new
features.  Those kinds of thing have not previously been listed as
keywords, and this was apparently done here by mistake, since these
keywords have been removed again in post-2016 working drafts.  So in
order to avoid bloating the keywords table unnecessarily, I have
omitted these erroneous keywords here.
parent 356c8379
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
use strict; use strict;
use warnings; use warnings;
my @sql_versions = reverse sort ('1992', '2008', '2011'); my @sql_versions = reverse sort ('1992', '2011', '2016');
my $srcdir = $ARGV[0]; my $srcdir = $ARGV[0];
......
...@@ -19,6 +19,7 @@ CASCADE ...@@ -19,6 +19,7 @@ CASCADE
CATALOG CATALOG
CATALOG_NAME CATALOG_NAME
CHAIN CHAIN
CHAINING
CHARACTER_SET_CATALOG CHARACTER_SET_CATALOG
CHARACTER_SET_NAME CHARACTER_SET_NAME
CHARACTER_SET_SCHEMA CHARACTER_SET_SCHEMA
...@@ -30,10 +31,12 @@ COLLATION ...@@ -30,10 +31,12 @@ COLLATION
COLLATION_CATALOG COLLATION_CATALOG
COLLATION_NAME COLLATION_NAME
COLLATION_SCHEMA COLLATION_SCHEMA
COLUMNS
COLUMN_NAME COLUMN_NAME
COMMAND_FUNCTION COMMAND_FUNCTION
COMMAND_FUNCTION_CODE COMMAND_FUNCTION_CODE
COMMITTED COMMITTED
CONDITIONAL
CONDITION_NUMBER CONDITION_NUMBER
CONNECTION CONNECTION
CONNECTION_NAME CONNECTION_NAME
...@@ -42,7 +45,6 @@ CONSTRAINT_NAME ...@@ -42,7 +45,6 @@ CONSTRAINT_NAME
CONSTRAINT_SCHEMA CONSTRAINT_SCHEMA
CONSTRAINTS CONSTRAINTS
CONSTRUCTOR CONSTRUCTOR
CONTAINS
CONTINUE CONTINUE
CURSOR_NAME CURSOR_NAME
DATA DATA
...@@ -63,15 +65,21 @@ DISPATCH ...@@ -63,15 +65,21 @@ DISPATCH
DOMAIN DOMAIN
DYNAMIC_FUNCTION DYNAMIC_FUNCTION
DYNAMIC_FUNCTION_CODE DYNAMIC_FUNCTION_CODE
EQUALS ENCODING
ENFORCED
ERROR
EXCLUDE EXCLUDE
EXCLUDING EXCLUDING
EXPRESSION
FINAL FINAL
FINISH
FIRST FIRST
FLAG FLAG
FOLLOWING FOLLOWING
FORMAT
FORTRAN FORTRAN
FOUND FOUND
FULFILL
G G
GENERAL GENERAL
GENERATED GENERATED
...@@ -81,6 +89,7 @@ GRANTED ...@@ -81,6 +89,7 @@ GRANTED
HIERARCHY HIERARCHY
IGNORE IGNORE
IMMEDIATE IMMEDIATE
IMMEDIATELY
IMPLEMENTATION IMPLEMENTATION
INCLUDING INCLUDING
INCREMENT INCREMENT
...@@ -91,8 +100,11 @@ INSTANTIABLE ...@@ -91,8 +100,11 @@ INSTANTIABLE
INSTEAD INSTEAD
INVOKER INVOKER
ISOLATION ISOLATION
JSON
K K
KEEP
KEY KEY
KEYS
KEY_MEMBER KEY_MEMBER
KEY_TYPE KEY_TYPE
LAST LAST
...@@ -111,6 +123,7 @@ MORE ...@@ -111,6 +123,7 @@ MORE
MUMPS MUMPS
NAME NAME
NAMES NAMES
NESTED
NESTING NESTING
NEXT NEXT
NFC NFC
...@@ -129,6 +142,7 @@ ORDERING ...@@ -129,6 +142,7 @@ ORDERING
ORDINALITY ORDINALITY
OTHERS OTHERS
OUTPUT OUTPUT
OVERFLOW
OVERRIDING OVERRIDING
P P
PAD PAD
...@@ -140,14 +154,21 @@ PARAMETER_SPECIFIC_NAME ...@@ -140,14 +154,21 @@ PARAMETER_SPECIFIC_NAME
PARAMETER_SPECIFIC_SCHEMA PARAMETER_SPECIFIC_SCHEMA
PARTIAL PARTIAL
PASCAL PASCAL
PASS
PASSING
PAST
PATH PATH
PLACING PLACING
PLAN
PLI PLI
PRECEDING PRECEDING
PRESERVE PRESERVE
PRIOR PRIOR
PRIVATE
PRIVILEGES PRIVILEGES
PRUNE
PUBLIC PUBLIC
QUOTES
READ READ
RELATIVE RELATIVE
REPEATABLE REPEATABLE
...@@ -158,12 +179,14 @@ RETURNED_CARDINALITY ...@@ -158,12 +179,14 @@ RETURNED_CARDINALITY
RETURNED_LENGTH RETURNED_LENGTH
RETURNED_OCTET_LENGTH RETURNED_OCTET_LENGTH
RETURNED_SQLSTATE RETURNED_SQLSTATE
RETURNING
ROLE ROLE
ROUTINE ROUTINE
ROUTINE_CATALOG ROUTINE_CATALOG
ROUTINE_NAME ROUTINE_NAME
ROUTINE_SCHEMA ROUTINE_SCHEMA
ROW_COUNT ROW_COUNT
SCALAR
SCALE SCALE
SCHEMA SCHEMA
SCHEMA_NAME SCHEMA_NAME
...@@ -185,12 +208,14 @@ SPACE ...@@ -185,12 +208,14 @@ SPACE
SPECIFIC_NAME SPECIFIC_NAME
STATE STATE
STATEMENT STATEMENT
STRING
STRUCTURE STRUCTURE
STYLE STYLE
SUBCLASS_ORIGIN SUBCLASS_ORIGIN
T T
TABLE_NAME TABLE_NAME
TEMPORARY TEMPORARY
THROUGH
TIES TIES
TOP_LEVEL_COUNT TOP_LEVEL_COUNT
TRANSACTION TRANSACTION
...@@ -205,6 +230,7 @@ TRIGGER_SCHEMA ...@@ -205,6 +230,7 @@ TRIGGER_SCHEMA
TYPE TYPE
UNBOUNDED UNBOUNDED
UNCOMMITTED UNCOMMITTED
UNCONDITIONAL
UNDER UNDER
UNNAMED UNNAMED
USAGE USAGE
...@@ -212,7 +238,11 @@ USER_DEFINED_TYPE_CATALOG ...@@ -212,7 +238,11 @@ USER_DEFINED_TYPE_CATALOG
USER_DEFINED_TYPE_CODE USER_DEFINED_TYPE_CODE
USER_DEFINED_TYPE_NAME USER_DEFINED_TYPE_NAME
USER_DEFINED_TYPE_SCHEMA USER_DEFINED_TYPE_SCHEMA
UTF16
UTF32
UTF8
VIEW VIEW
WORK WORK
WRAPPER
WRITE WRITE
ZONE ZONE
ABS ABS
ACOS
ALL ALL
ALLOCATE ALLOCATE
ALTER ALTER
...@@ -7,14 +8,19 @@ ANY ...@@ -7,14 +8,19 @@ ANY
ARE ARE
ARRAY ARRAY
ARRAY_AGG ARRAY_AGG
ARRAY_MAX_CARDINALITY
AS AS
ASENSITIVE ASENSITIVE
ASIN
ASYMMETRIC ASYMMETRIC
AT AT
ATAN
ATOMIC ATOMIC
AUTHORIZATION AUTHORIZATION
AVG AVG
BEGIN BEGIN
BEGIN_FRAME
BEGIN_PARTITION
BETWEEN BETWEEN
BIGINT BIGINT
BINARY BINARY
...@@ -35,6 +41,7 @@ CHAR_LENGTH ...@@ -35,6 +41,7 @@ CHAR_LENGTH
CHARACTER CHARACTER
CHARACTER_LENGTH CHARACTER_LENGTH
CHECK CHECK
CLASSIFIER
CLOB CLOB
CLOSE CLOSE
COALESCE COALESCE
...@@ -45,9 +52,13 @@ COMMIT ...@@ -45,9 +52,13 @@ COMMIT
CONDITION CONDITION
CONNECT CONNECT
CONSTRAINT CONSTRAINT
CONTAINS
CONVERT CONVERT
COPY
CORR CORR
CORRESPONDING CORRESPONDING
COS
COSH
COUNT COUNT
COVAR_POP COVAR_POP
COVAR_SAMP COVAR_SAMP
...@@ -61,6 +72,7 @@ CURRENT_DATE ...@@ -61,6 +72,7 @@ CURRENT_DATE
CURRENT_DEFAULT_TRANSFORM_GROUP CURRENT_DEFAULT_TRANSFORM_GROUP
CURRENT_PATH CURRENT_PATH
CURRENT_ROLE CURRENT_ROLE
CURRENT_ROW
CURRENT_SCHEMA CURRENT_SCHEMA
CURRENT_TIME CURRENT_TIME
CURRENT_TIMESTAMP CURRENT_TIMESTAMP
...@@ -73,8 +85,10 @@ DAY ...@@ -73,8 +85,10 @@ DAY
DEALLOCATE DEALLOCATE
DEC DEC
DECIMAL DECIMAL
DECFLOAT
DECLARE DECLARE
DEFAULT DEFAULT
DEFINE
DELETE DELETE
DENSE_RANK DENSE_RANK
DEREF DEREF
...@@ -88,8 +102,12 @@ DYNAMIC ...@@ -88,8 +102,12 @@ DYNAMIC
EACH EACH
ELEMENT ELEMENT
ELSE ELSE
EMPTY
END END
END_FRAME
END_PARTITION
END-EXEC END-EXEC
EQUALS
ESCAPE ESCAPE
EVERY EVERY
EXCEPT EXCEPT
...@@ -107,6 +125,7 @@ FLOAT ...@@ -107,6 +125,7 @@ FLOAT
FLOOR FLOOR
FOR FOR
FOREIGN FOREIGN
FRAME_ROW
FREE FREE
FROM FROM
FULL FULL
...@@ -117,12 +136,14 @@ GLOBAL ...@@ -117,12 +136,14 @@ GLOBAL
GRANT GRANT
GROUP GROUP
GROUPING GROUPING
GROUPS
HAVING HAVING
HOLD HOLD
HOUR HOUR
IDENTITY IDENTITY
IN IN
INDICATOR INDICATOR
INITIAL
INNER INNER
INOUT INOUT
INSENSITIVE INSENSITIVE
...@@ -135,6 +156,15 @@ INTERVAL ...@@ -135,6 +156,15 @@ INTERVAL
INTO INTO
IS IS
JOIN JOIN
JSON_ARRAY
JSON_ARRAYAGG
JSON_EXISTS
JSON_OBJECT
JSON_OBJECTAGG
JSON_QUERY
JSON_TABLE
JSON_TABLE_PRIMITIVE
JSON_VALUE
LAG LAG
LANGUAGE LANGUAGE
LARGE LARGE
...@@ -145,14 +175,20 @@ LEADING ...@@ -145,14 +175,20 @@ LEADING
LEFT LEFT
LIKE LIKE
LIKE_REGEX LIKE_REGEX
LISTAGG
LN LN
LOCAL LOCAL
LOCALTIME LOCALTIME
LOCALTIMESTAMP LOCALTIMESTAMP
LOG
LOG10
LOWER LOWER
MATCH MATCH
MATCH_NUMBER
MATCH_RECOGNIZE
MATCHES
MAX MAX
MAX_CARDINALITY MEASURES
MEMBER MEMBER
MERGE MERGE
METHOD METHOD
...@@ -182,7 +218,9 @@ OCCURRENCES_REGEX ...@@ -182,7 +218,9 @@ OCCURRENCES_REGEX
OF OF
OFFSET OFFSET
OLD OLD
OMIT
ON ON
ONE
ONLY ONLY
OPEN OPEN
OR OR
...@@ -194,16 +232,24 @@ OVERLAPS ...@@ -194,16 +232,24 @@ OVERLAPS
OVERLAY OVERLAY
PARAMETER PARAMETER
PARTITION PARTITION
PATTERN
PER
PERCENT
PERCENT_RANK PERCENT_RANK
PERCENTILE_CONT PERCENTILE_CONT
PERCENTILE_DISC PERCENTILE_DISC
PERIOD
PERMUTE
PORTION
POSITION POSITION
POSITION_REGEX POSITION_REGEX
POWER POWER
PRECEDES
PRECISION PRECISION
PREPARE PREPARE
PRIMARY PRIMARY
PROCEDURE PROCEDURE
PTF
RANGE RANGE
RANK RANK
READS READS
...@@ -232,16 +278,22 @@ ROLLUP ...@@ -232,16 +278,22 @@ ROLLUP
ROW ROW
ROW_NUMBER ROW_NUMBER
ROWS ROWS
RUNNING
SAVEPOINT SAVEPOINT
SCOPE SCOPE
SCROLL SCROLL
SEARCH SEARCH
SECOND SECOND
SEEK
SELECT SELECT
SENSITIVE SENSITIVE
SESSION_USER SESSION_USER
SET SET
SHOW
SIMILAR SIMILAR
SIN
SINH
SKIP
SMALLINT SMALLINT
SOME SOME
SPECIFIC SPECIFIC
...@@ -256,14 +308,19 @@ STATIC ...@@ -256,14 +308,19 @@ STATIC
STDDEV_POP STDDEV_POP
STDDEV_SAMP STDDEV_SAMP
SUBMULTISET SUBMULTISET
SUBSET
SUBSTRING SUBSTRING
SUBSTRING_REGEX SUBSTRING_REGEX
SUCCEEDS
SUM SUM
SYMMETRIC SYMMETRIC
SYSTEM SYSTEM
SYSTEM_TIME
SYSTEM_USER SYSTEM_USER
TABLE TABLE
TABLESAMPLE TABLESAMPLE
TAN
TANH
THEN THEN
TIME TIME
TIMESTAMP TIMESTAMP
...@@ -276,14 +333,15 @@ TRANSLATE_REGEX ...@@ -276,14 +333,15 @@ TRANSLATE_REGEX
TRANSLATION TRANSLATION
TREAT TREAT
TRIGGER TRIGGER
TRUNCATE
TRIM TRIM
TRIM_ARRAY TRIM_ARRAY
TRUE TRUE
TRUNCATE
UESCAPE UESCAPE
UNION UNION
UNIQUE UNIQUE
UNKNOWN UNKNOWN
UNMATCHED
UNNEST UNNEST
UPDATE UPDATE
UPPER UPPER
...@@ -291,11 +349,13 @@ USER ...@@ -291,11 +349,13 @@ USER
USING USING
VALUE VALUE
VALUES VALUES
VALUE_OF
VAR_POP VAR_POP
VAR_SAMP VAR_SAMP
VARBINARY VARBINARY
VARCHAR VARCHAR
VARYING VARYING
VERSIONING
WHEN WHEN
WHENEVER WHENEVER
WHERE WHERE
......
...@@ -5,7 +5,6 @@ BOM ...@@ -5,7 +5,6 @@ BOM
COLUMNS COLUMNS
CONTENT CONTENT
DOCUMENT DOCUMENT
EMPTY
ENCODING ENCODING
HEX HEX
ID ID
...@@ -13,7 +12,6 @@ INDENT ...@@ -13,7 +12,6 @@ INDENT
LOCATION LOCATION
NAMESPACE NAMESPACE
NIL NIL
PASSING
PATH PATH
PRESERVE PRESERVE
RETURNING RETURNING
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment