Update SQL keywords and function list to MySQL 8.0 and MariaDB 10.3.

zufuliu · Jul 21, 2018 · cfc0e0a · cfc0e0a
1 parent 04124d6
commit cfc0e0a
Show file tree

Hide file tree

Showing 4 changed files with 792 additions and 531 deletions.
diff --git a/readme.md b/readme.md
@@ -90,7 +90,7 @@
 		* javap
 		* Jasmin
 	* SQL Query
-		* [MySQL](../master/tools/lang/MySQL.sql), up to 5.7.
+		* [MySQL](../master/tools/lang/MySQL.sql), up to MySQL 8.0, MariaDB 10.3.
 		* [SQLite3](../master/tools/lang/SQLite3.sql)
 	* TCL
 	* Texinfo
@@ -137,7 +137,7 @@
 	* Python Script
 	* PHP Script
 	* SQL Query
-		* [MySQL](../master/tools/lang/MySQL.sql), up to 5.7.
+		* [MySQL](../master/tools/lang/MySQL.sql), up to MySQL 8.0, MariaDB 10.3.
 		* [SQLite3](../master/tools/lang/SQLite3.sql)
 * Syntax highlighting for function and type for C/C++ family language
 * Syntax highlighting for annotation for Java like JVM based language

diff --git a/scintilla/lexers/LexSQL.cxx b/scintilla/lexers/LexSQL.cxx
@@ -114,12 +114,17 @@ static void ColouriseSqlDoc(Sci_PositionU startPos, Sci_Position length, int ini
 			if (!IsSqlWordChar(sc.ch, sqlAllowDottedWord)) {
 				int nextState = SCE_SQL_DEFAULT;
 				char s[128];
+				char chNext = LexGetNextChar(sc.currentPos, styler);
 				sc.GetCurrentLowered(s, sizeof(s));
 				if (keywords1.InList(s)) {
-					sc.ChangeState(SCE_SQL_WORD);
+					if (chNext == '(' && strcmp(s, "repeat") == 0) {
+						sc.ChangeState(SCE_SQL_USER1);
+					} else {
+						sc.ChangeState(SCE_SQL_WORD);
+					}
 				} else if (keywords2.InList(s)) {
 					sc.ChangeState(SCE_SQL_WORD2);
-				} else if (LexGetNextChar(sc.currentPos, styler) == '(' && kw_user1.InListAbbreviated(s, '(')) {
+				} else if (chNext == '(' && kw_user1.InListAbbreviated(s, '(')) {
 					sc.ChangeState(SCE_SQL_USER1);
 				}
 				//} else if (kw_sqlplus.InListAbbreviated(s, '~')) {