DBIS
/
HyriseSQLParser
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove HISTORY keyword (#129)

This commit is contained in:
mrks 2019-07-31 12:43:18 +02:00 committed by GitHub
parent de4f81bb18
commit 755ea052d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 2238 additions and 2254 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2008
src/parser/bison_parser.cpp
View File

File diff suppressed because it is too large Load Diff

251
src/parser/bison_parser.h
View File

@ -52,7 +52,7 @@
extern int hsql_debug;
#endif
/* "%code requires" blocks. */
#line 35 "bison_parser.y" /* yacc.c:1921 */
#line 35 "bison_parser.y" /* yacc.c:1927 */
// %code requires block
@ -76,7 +76,7 @@ extern int hsql_debug;
} \
}
#line 80 "bison_parser.h" /* yacc.c:1921 */
#line 80 "bison_parser.h" /* yacc.c:1927 */
/* Token type. */
#ifndef HSQL_TOKENTYPE
@ -104,128 +104,127 @@ extern int hsql_debug;
SQL_DEFAULT = 276,
SQL_EXECUTE = 277,
SQL_EXPLAIN = 278,
SQL_HISTORY = 279,
SQL_INTEGER = 280,
SQL_NATURAL = 281,
SQL_PREPARE = 282,
SQL_PRIMARY = 283,
SQL_SCHEMAS = 284,
SQL_SPATIAL = 285,
SQL_VARCHAR = 286,
SQL_VIRTUAL = 287,
SQL_BEFORE = 288,
SQL_COLUMN = 289,
SQL_CREATE = 290,
SQL_DELETE = 291,
SQL_DIRECT = 292,
SQL_DOUBLE = 293,
SQL_ESCAPE = 294,
SQL_EXCEPT = 295,
SQL_EXISTS = 296,
SQL_EXTRACT = 297,
SQL_GLOBAL = 298,
SQL_HAVING = 299,
SQL_IMPORT = 300,
SQL_INSERT = 301,
SQL_ISNULL = 302,
SQL_OFFSET = 303,
SQL_RENAME = 304,
SQL_SCHEMA = 305,
SQL_SELECT = 306,
SQL_SORTED = 307,
SQL_TABLES = 308,
SQL_UNIQUE = 309,
SQL_UNLOAD = 310,
SQL_UPDATE = 311,
SQL_VALUES = 312,
SQL_AFTER = 313,
SQL_ALTER = 314,
SQL_CROSS = 315,
SQL_DELTA = 316,
SQL_FLOAT = 317,
SQL_GROUP = 318,
SQL_INDEX = 319,
SQL_INNER = 320,
SQL_LIMIT = 321,
SQL_LOCAL = 322,
SQL_MERGE = 323,
SQL_MINUS = 324,
SQL_ORDER = 325,
SQL_OUTER = 326,
SQL_RIGHT = 327,
SQL_TABLE = 328,
SQL_UNION = 329,
SQL_USING = 330,
SQL_WHERE = 331,
SQL_CALL = 332,
SQL_CASE = 333,
SQL_CHAR = 334,
SQL_DATE = 335,
SQL_DESC = 336,
SQL_DROP = 337,
SQL_ELSE = 338,
SQL_FILE = 339,
SQL_FROM = 340,
SQL_FULL = 341,
SQL_HASH = 342,
SQL_HINT = 343,
SQL_INTO = 344,
SQL_JOIN = 345,
SQL_LEFT = 346,
SQL_LIKE = 347,
SQL_LOAD = 348,
SQL_LONG = 349,
SQL_NULL = 350,
SQL_PLAN = 351,
SQL_SHOW = 352,
SQL_TEXT = 353,
SQL_THEN = 354,
SQL_TIME = 355,
SQL_VIEW = 356,
SQL_WHEN = 357,
SQL_WITH = 358,
SQL_ADD = 359,
SQL_ALL = 360,
SQL_AND = 361,
SQL_ASC = 362,
SQL_CSV = 363,
SQL_END = 364,
SQL_FOR = 365,
SQL_INT = 366,
SQL_KEY = 367,
SQL_NOT = 368,
SQL_OFF = 369,
SQL_SET = 370,
SQL_TBL = 371,
SQL_TOP = 372,
SQL_AS = 373,
SQL_BY = 374,
SQL_IF = 375,
SQL_IN = 376,
SQL_IS = 377,
SQL_OF = 378,
SQL_ON = 379,
SQL_OR = 380,
SQL_TO = 381,
SQL_ARRAY = 382,
SQL_CONCAT = 383,
SQL_ILIKE = 384,
SQL_SECOND = 385,
SQL_MINUTE = 386,
SQL_HOUR = 387,
SQL_DAY = 388,
SQL_MONTH = 389,
SQL_YEAR = 390,
SQL_TRUE = 391,
SQL_FALSE = 392,
SQL_EQUALS = 393,
SQL_NOTEQUALS = 394,
SQL_LESS = 395,
SQL_GREATER = 396,
SQL_LESSEQ = 397,
SQL_GREATEREQ = 398,
SQL_NOTNULL = 399,
SQL_UMINUS = 400
SQL_INTEGER = 279,
SQL_NATURAL = 280,
SQL_PREPARE = 281,
SQL_PRIMARY = 282,
SQL_SCHEMAS = 283,
SQL_SPATIAL = 284,
SQL_VARCHAR = 285,
SQL_VIRTUAL = 286,
SQL_BEFORE = 287,
SQL_COLUMN = 288,
SQL_CREATE = 289,
SQL_DELETE = 290,
SQL_DIRECT = 291,
SQL_DOUBLE = 292,
SQL_ESCAPE = 293,
SQL_EXCEPT = 294,
SQL_EXISTS = 295,
SQL_EXTRACT = 296,
SQL_GLOBAL = 297,
SQL_HAVING = 298,
SQL_IMPORT = 299,
SQL_INSERT = 300,
SQL_ISNULL = 301,
SQL_OFFSET = 302,
SQL_RENAME = 303,
SQL_SCHEMA = 304,
SQL_SELECT = 305,
SQL_SORTED = 306,
SQL_TABLES = 307,
SQL_UNIQUE = 308,
SQL_UNLOAD = 309,
SQL_UPDATE = 310,
SQL_VALUES = 311,
SQL_AFTER = 312,
SQL_ALTER = 313,
SQL_CROSS = 314,
SQL_DELTA = 315,
SQL_FLOAT = 316,
SQL_GROUP = 317,
SQL_INDEX = 318,
SQL_INNER = 319,
SQL_LIMIT = 320,
SQL_LOCAL = 321,
SQL_MERGE = 322,
SQL_MINUS = 323,
SQL_ORDER = 324,
SQL_OUTER = 325,
SQL_RIGHT = 326,
SQL_TABLE = 327,
SQL_UNION = 328,
SQL_USING = 329,
SQL_WHERE = 330,
SQL_CALL = 331,
SQL_CASE = 332,
SQL_CHAR = 333,
SQL_DATE = 334,
SQL_DESC = 335,
SQL_DROP = 336,
SQL_ELSE = 337,
SQL_FILE = 338,
SQL_FROM = 339,
SQL_FULL = 340,
SQL_HASH = 341,
SQL_HINT = 342,
SQL_INTO = 343,
SQL_JOIN = 344,
SQL_LEFT = 345,
SQL_LIKE = 346,
SQL_LOAD = 347,
SQL_LONG = 348,
SQL_NULL = 349,
SQL_PLAN = 350,
SQL_SHOW = 351,
SQL_TEXT = 352,
SQL_THEN = 353,
SQL_TIME = 354,
SQL_VIEW = 355,
SQL_WHEN = 356,
SQL_WITH = 357,
SQL_ADD = 358,
SQL_ALL = 359,
SQL_AND = 360,
SQL_ASC = 361,
SQL_CSV = 362,
SQL_END = 363,
SQL_FOR = 364,
SQL_INT = 365,
SQL_KEY = 366,
SQL_NOT = 367,
SQL_OFF = 368,
SQL_SET = 369,
SQL_TBL = 370,
SQL_TOP = 371,
SQL_AS = 372,
SQL_BY = 373,
SQL_IF = 374,
SQL_IN = 375,
SQL_IS = 376,
SQL_OF = 377,
SQL_ON = 378,
SQL_OR = 379,
SQL_TO = 380,
SQL_ARRAY = 381,
SQL_CONCAT = 382,
SQL_ILIKE = 383,
SQL_SECOND = 384,
SQL_MINUTE = 385,
SQL_HOUR = 386,
SQL_DAY = 387,
SQL_MONTH = 388,
SQL_YEAR = 389,
SQL_TRUE = 390,
SQL_FALSE = 391,
SQL_EQUALS = 392,
SQL_NOTEQUALS = 393,
SQL_LESS = 394,
SQL_GREATER = 395,
SQL_LESSEQ = 396,
SQL_GREATEREQ = 397,
SQL_NOTNULL = 398,
SQL_UMINUS = 399
};
#endif
@ -234,7 +233,7 @@ extern int hsql_debug;
union HSQL_STYPE
{
#line 95 "bison_parser.y" /* yacc.c:1921 */
#line 95 "bison_parser.y" /* yacc.c:1927 */
double fval;
int64_t ival;
@ -278,7 +277,7 @@ union HSQL_STYPE
std::vector<hsql::OrderDescription*>* order_vec;
std::vector<hsql::WithDescription*>* with_description_vec;
#line 282 "bison_parser.h" /* yacc.c:1921 */
#line 281 "bison_parser.h" /* yacc.c:1927 */
};
typedef union HSQL_STYPE HSQL_STYPE;

2
src/parser/bison_parser.y
View File

@ -165,7 +165,7 @@ int yyerror(YYLTYPE* llocp, SQLParserResult* result, yyscan_t scanner, const cha
%token DEALLOCATE PARAMETERS INTERSECT TEMPORARY TIMESTAMP
%token DISTINCT NVARCHAR RESTRICT TRUNCATE ANALYZE BETWEEN
%token CASCADE COLUMNS CONTROL DEFAULT EXECUTE EXPLAIN
%token HISTORY INTEGER NATURAL PREPARE PRIMARY SCHEMAS
%token INTEGER NATURAL PREPARE PRIMARY SCHEMAS
%token SPATIAL VARCHAR VIRTUAL BEFORE COLUMN CREATE DELETE DIRECT
%token DOUBLE ESCAPE EXCEPT EXISTS EXTRACT GLOBAL HAVING IMPORT
%token INSERT ISNULL OFFSET RENAME SCHEMA SELECT SORTED

2220
src/parser/flex_lexer.cpp
View File

File diff suppressed because it is too large Load Diff

8
src/parser/flex_lexer.h
View File

@ -2,9 +2,9 @@
#define hsql_HEADER_H 1
#define hsql_IN_HEADER 1
#line 6 "flex_lexer.h"
#line 5 "flex_lexer.h"
#line 8 "flex_lexer.h"
#line 7 "flex_lexer.h"
#define YY_INT_ALIGNED short int
@ -730,9 +730,9 @@ extern int yylex \
#undef yyTABLES_NAME
#endif
#line 236 "flex_lexer.l"
#line 235 "flex_lexer.l"
#line 737 "flex_lexer.h"
#line 736 "flex_lexer.h"
#undef hsql_IN_HEADER
#endif /* hsql_HEADER_H */

1
src/parser/flex_lexer.l
View File

@ -78,7 +78,6 @@ CONTROL TOKEN(CONTROL)
DEFAULT TOKEN(DEFAULT)
EXECUTE TOKEN(EXECUTE)
EXPLAIN TOKEN(EXPLAIN)
HISTORY TOKEN(HISTORY)
INTEGER TOKEN(INTEGER)
NATURAL TOKEN(NATURAL)
PREPARE TOKEN(PREPARE)

2
src/parser/sql_keywords.txt
View File

@ -86,12 +86,10 @@ UPDATE
SET
DELETE
HISTORY
TRUNCATE
MERGE
HISTORY
DELTA
OF