diff options
Diffstat (limited to 'kexi/kexidb/parser')
-rw-r--r-- | kexi/kexidb/parser/sqlparser.cpp | 36 | ||||
-rw-r--r-- | kexi/kexidb/parser/sqlparser.h | 28 | ||||
-rw-r--r-- | kexi/kexidb/parser/sqlscanner.cpp | 2 |
3 files changed, 33 insertions, 33 deletions
diff --git a/kexi/kexidb/parser/sqlparser.cpp b/kexi/kexidb/parser/sqlparser.cpp index c7c3aa99..c3d2f53d 100644 --- a/kexi/kexidb/parser/sqlparser.cpp +++ b/kexi/kexidb/parser/sqlparser.cpp @@ -174,12 +174,12 @@ DISTINCT = 363, DOMAIN_TOKEN = 364, SQL_DOUBLE = 365, - DOUBLE_TQUOTED_STRING = 366, + DOUBLE_QUOTED_STRING = 366, DROP = 367, ELSE = 368, END = 369, END_EXEC = 370, - ETQUAL = 371, + EQUAL = 371, ESCAPE = 372, EXCEPT = 373, SQL_EXCEPTION = 374, @@ -296,7 +296,7 @@ PARTIAL = 485, SQL_PASCAL = 486, PERSISTENT = 487, - CTQL_PI = 488, + CQL_PI = 488, PLI = 489, POSITION = 490, PRECISION = 491, @@ -308,8 +308,8 @@ PROCEDURE = 497, PRODUCT = 498, PUBLIC = 499, - TQUARTER = 500, - TQUIT = 501, + QUARTER = 500, + QUIT = 501, RAND = 502, READ_ONLY = 503, REAL = 504, @@ -381,7 +381,7 @@ TWO_DIGITS = 570, UCASE = 571, UNION = 572, - UNITQUE = 573, + UNIQUE = 573, SQL_UNKNOWN = 574, UPDATE = 575, UPPER = 576, @@ -389,7 +389,7 @@ USER = 578, IDENTIFIER = 579, IDENTIFIER_DOT_ASTERISK = 580, - TQUERY_PARAMETER = 581, + QUERY_PARAMETER = 581, USING = 582, VALUE = 583, VALUES = 584, @@ -524,12 +524,12 @@ #define DISTINCT 363 #define DOMAIN_TOKEN 364 #define SQL_DOUBLE 365 -#define DOUBLE_TQUOTED_STRING 366 +#define DOUBLE_QUOTED_STRING 366 #define DROP 367 #define ELSE 368 #define END 369 #define END_EXEC 370 -#define ETQUAL 371 +#define EQUAL 371 #define ESCAPE 372 #define EXCEPT 373 #define SQL_EXCEPTION 374 @@ -646,7 +646,7 @@ #define PARTIAL 485 #define SQL_PASCAL 486 #define PERSISTENT 487 -#define CTQL_PI 488 +#define CQL_PI 488 #define PLI 489 #define POSITION 490 #define PRECISION 491 @@ -658,8 +658,8 @@ #define PROCEDURE 497 #define PRODUCT 498 #define PUBLIC 499 -#define TQUARTER 500 -#define TQUIT 501 +#define QUARTER 500 +#define QUIT 501 #define RAND 502 #define READ_ONLY 503 #define REAL 504 @@ -731,7 +731,7 @@ #define TWO_DIGITS 570 #define UCASE 571 #define UNION 572 -#define UNITQUE 573 +#define UNIQUE 573 #define SQL_UNKNOWN 574 #define UPDATE 575 #define UPPER 576 @@ -739,7 +739,7 @@ #define USER 578 #define IDENTIFIER 579 #define IDENTIFIER_DOT_ASTERISK 580 -#define TQUERY_PARAMETER 581 +#define QUERY_PARAMETER 581 #define USING 582 #define VALUE 583 #define VALUES 584 @@ -1290,8 +1290,8 @@ static const char *const yytname[] = "DEC", "DECLARE", "DEFAULT", "DEFERRABLE", "DEFERRED", "SQL_DELETE", "DESC", "DESCRIBE", "DESCRIPTOR", "DIAGNOSTICS", "DICTIONARY", "DIRECTORY", "DISCONNECT", "DISPLACEMENT", "DISTINCT", "DOMAIN_TOKEN", - "SQL_DOUBLE", "DOUBLE_TQUOTED_STRING", "DROP", "ELSE", "END", "END_EXEC", - "ETQUAL", "ESCAPE", "EXCEPT", "SQL_EXCEPTION", "EXEC", "EXECUTE", + "SQL_DOUBLE", "DOUBLE_QUOTED_STRING", "DROP", "ELSE", "END", "END_EXEC", + "EQUAL", "ESCAPE", "EXCEPT", "SQL_EXCEPTION", "EXEC", "EXECUTE", "EXISTS", "EXP", "EXPONENT", "EXTERNAL", "EXTRACT", "SQL_FALSE", "FETCH", "FIRST", "SQL_FLOAT", "FLOOR", "FN", "FOR", "FOREIGN", "FORTRAN", "FOUND", "FOUR_DIGITS", "FROM", "FULL", "GET", "GLOBAL", "GO", "GOTO", @@ -1308,7 +1308,7 @@ static const char *const yytname[] = "NOW", "SQL_NULL", "SQL_IS", "SQL_IS_NULL", "SQL_IS_NOT_NULL", "NULLIF", "NUMERIC", "OCTET_LENGTH", "ODBC", "OF", "SQL_OFF", "SQL_ON", "ONLY", "OPEN", "OPTION", "OR", "ORDER", "OUTER", "OUTPUT", "OVERLAPS", "PAGE", - "PARTIAL", "SQL_PASCAL", "PERSISTENT", "CTQL_PI", "PLI", "POSITION", + "PARTIAL", "SQL_PASCAL", "PERSISTENT", "CQL_PI", "PLI", "POSITION", "PRECISION", "PREPARE", "PRESERVE", "PRIMARY", "PRIOR", "PRIVILEGES", "PROCEDURE", "PRODUCT", "PUBLIC", "QUARTER", "QUIT", "RAND", "READ_ONLY", "REAL", "REFERENCES", "REPEAT", "REPLACE", "RESTRICT", "REVOKE", "RIGHT", @@ -1322,7 +1322,7 @@ static const char *const yytname[] = "TAN", "TEMPORARY", "THEN", "THREE_DIGITS", "TIME", "TIMESTAMP", "TIMEZONE_HOUR", "TIMEZONE_MINUTE", "TINYINT", "TO", "TO_CHAR", "TO_DATE", "TRANSACTION", "TRANSLATE", "TRANSLATION", "TRUNCATE", - "GENERAL_TITLE", "TWO_DIGITS", "UCASE", "UNION", "UNITQUE", "SQL_UNKNOWN", + "GENERAL_TITLE", "TWO_DIGITS", "UCASE", "UNION", "UNIQUE", "SQL_UNKNOWN", "UPDATE", "UPPER", "USAGE", "USER", "IDENTIFIER", "IDENTIFIER_DOT_ASTERISK", "QUERY_PARAMETER", "USING", "VALUE", "VALUES", "VARBINARY", "VARCHAR", "VARYING", "VENDOR", "VIEW", "WEEK", "WHEN", diff --git a/kexi/kexidb/parser/sqlparser.h b/kexi/kexidb/parser/sqlparser.h index 6f2b6534..f9bd290e 100644 --- a/kexi/kexidb/parser/sqlparser.h +++ b/kexi/kexidb/parser/sqlparser.h @@ -154,12 +154,12 @@ bool parseData(KexiDB::Parser *p, const char *data); DISTINCT = 363, DOMAIN_TOKEN = 364, SQL_DOUBLE = 365, - DOUBLE_TQUOTED_STRING = 366, + DOUBLE_QUOTED_STRING = 366, DROP = 367, ELSE = 368, END = 369, END_EXEC = 370, - ETQUAL = 371, + EQUAL = 371, ESCAPE = 372, EXCEPT = 373, SQL_EXCEPTION = 374, @@ -276,7 +276,7 @@ bool parseData(KexiDB::Parser *p, const char *data); PARTIAL = 485, SQL_PASCAL = 486, PERSISTENT = 487, - CTQL_PI = 488, + CQL_PI = 488, PLI = 489, POSITION = 490, PRECISION = 491, @@ -288,8 +288,8 @@ bool parseData(KexiDB::Parser *p, const char *data); PROCEDURE = 497, PRODUCT = 498, PUBLIC = 499, - TQUARTER = 500, - TQUIT = 501, + QUARTER = 500, + QUIT = 501, RAND = 502, READ_ONLY = 503, REAL = 504, @@ -361,7 +361,7 @@ bool parseData(KexiDB::Parser *p, const char *data); TWO_DIGITS = 570, UCASE = 571, UNION = 572, - UNITQUE = 573, + UNIQUE = 573, SQL_UNKNOWN = 574, UPDATE = 575, UPPER = 576, @@ -369,7 +369,7 @@ bool parseData(KexiDB::Parser *p, const char *data); USER = 578, IDENTIFIER = 579, IDENTIFIER_DOT_ASTERISK = 580, - TQUERY_PARAMETER = 581, + QUERY_PARAMETER = 581, USING = 582, VALUE = 583, VALUES = 584, @@ -504,12 +504,12 @@ bool parseData(KexiDB::Parser *p, const char *data); #define DISTINCT 363 #define DOMAIN_TOKEN 364 #define SQL_DOUBLE 365 -#define DOUBLE_TQUOTED_STRING 366 +#define DOUBLE_QUOTED_STRING 366 #define DROP 367 #define ELSE 368 #define END 369 #define END_EXEC 370 -#define ETQUAL 371 +#define EQUAL 371 #define ESCAPE 372 #define EXCEPT 373 #define SQL_EXCEPTION 374 @@ -626,7 +626,7 @@ bool parseData(KexiDB::Parser *p, const char *data); #define PARTIAL 485 #define SQL_PASCAL 486 #define PERSISTENT 487 -#define CTQL_PI 488 +#define CQL_PI 488 #define PLI 489 #define POSITION 490 #define PRECISION 491 @@ -638,8 +638,8 @@ bool parseData(KexiDB::Parser *p, const char *data); #define PROCEDURE 497 #define PRODUCT 498 #define PUBLIC 499 -#define TQUARTER 500 -#define TQUIT 501 +#define QUARTER 500 +#define QUIT 501 #define RAND 502 #define READ_ONLY 503 #define REAL 504 @@ -711,7 +711,7 @@ bool parseData(KexiDB::Parser *p, const char *data); #define TWO_DIGITS 570 #define UCASE 571 #define UNION 572 -#define UNITQUE 573 +#define UNIQUE 573 #define SQL_UNKNOWN 574 #define UPDATE 575 #define UPPER 576 @@ -719,7 +719,7 @@ bool parseData(KexiDB::Parser *p, const char *data); #define USER 578 #define IDENTIFIER 579 #define IDENTIFIER_DOT_ASTERISK 580 -#define TQUERY_PARAMETER 581 +#define QUERY_PARAMETER 581 #define USING 582 #define VALUE 583 #define VALUES 584 diff --git a/kexi/kexidb/parser/sqlscanner.cpp b/kexi/kexidb/parser/sqlscanner.cpp index 10fe70a2..f59b5096 100644 --- a/kexi/kexidb/parser/sqlscanner.cpp +++ b/kexi/kexidb/parser/sqlscanner.cpp @@ -1125,7 +1125,7 @@ YY_RULE_SETUP KexiDBDbg << "yytext: '" << yytext << "' (" << yyleng << ")" << endl; ECOUNT; yylval.stringValue = new TQString(TQString::fromUtf8(yytext+1, yyleng-2)); - return TQUERY_PARAMETER; + return QUERY_PARAMETER; } YY_BREAK case 41: |