Merge branch '2.2' into develop

VERSION22.cmake

@@ -5,7 +5,7 @@
 
 set(MAXSCALE_VERSION_MAJOR "2" CACHE STRING "Major version")
 set(MAXSCALE_VERSION_MINOR "2" CACHE STRING "Minor version")
-set(MAXSCALE_VERSION_PATCH "5" CACHE STRING "Patch version")
+set(MAXSCALE_VERSION_PATCH "6" CACHE STRING "Patch version")
 
 # This should only be incremented if a package is rebuilt
 set(MAXSCALE_BUILD_NUMBER 1 CACHE STRING "Release number")

query_classifier/qc_sqlite/sqlite-src-3110100/src/parse.y

@@ -626,6 +626,7 @@ columnid(A) ::= nm(X). {
   NAMES NEXT
   NO
   OF OFFSET OPEN
+  PREVIOUS
   QUICK
   RAISE RECURSIVE /*REINDEX*/ RELEASE /*RENAME*/ /*REPLACE*/ RESTRICT ROLLBACK ROLLUP ROW
   SAVEPOINT SELECT_OPTIONS_KW /*SEQUENCE*/ SLAVE /*START*/ STATUS
@@ -1207,7 +1208,10 @@ selcollist(A) ::= sclp(P) nm(X) DOT STAR(Y). {
   A = sqlite3ExprListAppend(pParse,P, pDot);
 }
 %ifdef MAXSCALE
-selcollist(A) ::= sclp(P) NEXT VALUE FOR nm(X) as(Y).     {
+next_or_previous(A) ::= NEXT(X). {A = X;}
+next_or_previous(A) ::= PREVIOUS(X). {A = X;}
+
+selcollist(A) ::= sclp(P) next_or_previous VALUE FOR nm(X) as(Y).     {
   Expr* pSeq = sqlite3PExpr(pParse, TK_ID, 0, 0, &X);
   ExprList* pArgs = sqlite3ExprListAppend(pParse, NULL, pSeq);
   Token nextval = { "nextval", 7 };

query_classifier/qc_sqlite/sqlite-src-3110100/tool/mkkeywordhash.c

@@ -383,6 +383,7 @@ static Keyword aKeywordTable[] = {
 #ifdef MAXSCALE
   { "PRECEDING",        "TK_PRECEDING",    ALWAYS                 },
   { "PREPARE",          "TK_PREPARE",      ALWAYS                 },
+  { "PREVIOUS",         "TK_PREVIOUS",     ALWAYS                 },
 #endif
   { "PRIMARY",          "TK_PRIMARY",      ALWAYS                 },
 #ifdef MAXSCALE

query_classifier/test/maxscale.test

@@ -103,3 +103,6 @@ SELECT id as engine FROM users WHERE id = 1;
 
 # MXS-1787
 CALL p1((SELECT f1()), ?);
+
+# MXS-1829
+SELECT PREVIOUS VALUE FOR SEQ;