From 665329ab0099379ae8384a4dc484fa6035be5e39 Mon Sep 17 00:00:00 2001
From: Dmitry Yemanov <dyemanov@users.noreply.github.com>
Date: Sun, 10 Mar 2019 20:46:55 +0300
Subject: [PATCH] Corrections

---
 src/yvalve/keywords.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/yvalve/keywords.cpp b/src/yvalve/keywords.cpp
index 373386e30a..094529739f 100644
--- a/src/yvalve/keywords.cpp
+++ b/src/yvalve/keywords.cpp
@@ -198,7 +198,7 @@ static const TOK tokens[] =
 	{TOK_ENTRY_POINT, "ENTRY_POINT", true},
 	{TOK_ESCAPE, "ESCAPE", false},
 	{TOK_EXCEPTION, "EXCEPTION", true},
-	{TOK_EXCESS, "EXCESS", true },
+	{TOK_EXCESS, "EXCESS", true},
 	{TOK_EXCLUDE, "EXCLUDE", true},
 	{TOK_EXECUTE, "EXECUTE", false},
 	{TOK_EXISTS, "EXISTS", false},
@@ -276,9 +276,9 @@ static const TOK tokens[] =
 	{TOK_LINGER, "LINGER", true},
 	{TOK_LIST, "LIST", true},
 	{TOK_LN, "LN", true},
-	{TOK_LOCAL, "LOCAL", true},
-	{TOK_LOCALTIME, "LOCALTIME", true},
-	{TOK_LOCALTIMESTAMP, "LOCALTIMESTAMP", true},
+	{TOK_LOCAL, "LOCAL", false},
+	{TOK_LOCALTIME, "LOCALTIME", false},
+	{TOK_LOCALTIMESTAMP, "LOCALTIMESTAMP", false},
 	{TOK_LOCK, "LOCK", true},
 	{TOK_LOG, "LOG", true},
 	{TOK_LOG10, "LOG10", true},
@@ -378,7 +378,6 @@ static const TOK tokens[] =
 	{TOK_RDB_SYSTEM_PRIVILEGE, "RDB$SYSTEM_PRIVILEGE", false},
 	{TOK_READ, "READ", true},
 	{TOK_REAL, "REAL", false},
-	{TOK_RESET, "RESET", true},
 	{TOK_VERSION, "RECORD_VERSION", false},
 	{TOK_RECREATE, "RECREATE", false},
 	{TOK_RECURSIVE, "RECURSIVE", false},
@@ -398,6 +397,7 @@ static const TOK tokens[] =
 	{TOK_REQUESTS, "REQUESTS", true},
 	{TOK_RESERVING, "RESERV", true},	// Alias of RESERVING
 	{TOK_RESERVING, "RESERVING", true},
+	{TOK_RESET, "RESET", true},
 	{TOK_RESTART, "RESTART", true},
 	{TOK_RESTRICT, "RESTRICT", true},
 	{TOK_RETAIN, "RETAIN", true},
@@ -425,11 +425,9 @@ static const TOK tokens[] =
 	{TOK_SALT_LENGTH, "SALT_LENGTH", true},
 	{TOK_SAVEPOINT, "SAVEPOINT", false},
 	{TOK_SCALAR_ARRAY, "SCALAR_ARRAY", true},
-	{TOK_SIGNATURE, "SIGNATURE", true},
 	{TOK_DATABASE, "SCHEMA", false},	// Alias of DATABASE
 	{TOK_SCROLL, "SCROLL", false},
 	{TOK_SECOND, "SECOND", false},
-	{TOK_SQL, "SQL", true},
 	{TOK_SECURITY, "SECURITY", true},
 	{TOK_SEGMENT, "SEGMENT", true},
 	{TOK_SELECT, "SELECT", false},
@@ -441,6 +439,7 @@ static const TOK tokens[] =
 	{TOK_SHADOW, "SHADOW", true},
 	{TOK_SHARED, "SHARED", true},
 	{TOK_SIGN, "SIGN", true},
+	{TOK_SIGNATURE, "SIGNATURE", true},
 	{TOK_SIMILAR, "SIMILAR", false},
 	{TOK_SIN, "SIN", true},
 	{TOK_SINGULAR, "SINGULAR", true},
@@ -453,6 +452,7 @@ static const TOK tokens[] =
 	{TOK_SORT, "SORT", true},
 	{TOK_SOURCE, "SOURCE", true},
 	{TOK_SPACE, "SPACE", true},
+	{TOK_SQL, "SQL", true},
 	{TOK_SQLCODE, "SQLCODE", false},
 	{TOK_SQLSTATE, "SQLSTATE", false},
 	{TOK_SQRT, "SQRT", true},
@@ -479,8 +479,8 @@ static const TOK tokens[] =
 	{TOK_TIME, "TIME", false},
 	{TOK_TIMESTAMP, "TIMESTAMP", false},
 	{TOK_TIMEOUT, "TIMEOUT", true},
-	{TOK_TIMEZONE_HOUR, "TIMEZONE_HOUR", true},
-	{TOK_TIMEZONE_MINUTE, "TIMEZONE_MINUTE", true},
+	{TOK_TIMEZONE_HOUR, "TIMEZONE_HOUR", false},
+	{TOK_TIMEZONE_MINUTE, "TIMEZONE_MINUTE", false},
 	{TOK_TO, "TO", false},
 	{TOK_TOTALORDER, "TOTALORDER", true},
 	{TOK_TRAILING, "TRAILING", false},