added SQL_CACHE implementation and changed

wumpz · wumpz · commit cf0128ac884c · 2022-01-09T13:16:39.000+01:00
diff --git a/src/main/java/net/sf/jsqlparser/parser/feature/Feature.java b/src/main/java/net/sf/jsqlparser/parser/feature/Feature.java
@@ -699,7 +699,7 @@ public enum Feature {
     // MYSQL
 
     mySqlHintStraightJoin,
-    mysqlSqlNoCache,
+    mysqlSqlCacheFlag,
     mysqlCalcFoundRows,
 
     // SQLSERVER
diff --git a/src/main/java/net/sf/jsqlparser/statement/select/MySqlSqlCacheFlags.java b/src/main/java/net/sf/jsqlparser/statement/select/MySqlSqlCacheFlags.java
@@ -0,0 +1,18 @@
+/*-
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2022 JSQLParser
+ * %%
+ * Dual licensed under GNU LGPL 2.1 or Apache License 2.0
+ * #L%
+ */
+package net.sf.jsqlparser.statement.select;
+
+/**
+ *
+ * @author tw
+ */
+public enum MySqlSqlCacheFlags {
+     SQL_CACHE, SQL_NO_CACHE
+}
diff --git a/src/main/java/net/sf/jsqlparser/statement/select/PlainSelect.java b/src/main/java/net/sf/jsqlparser/statement/select/PlainSelect.java
@@ -49,7 +49,7 @@ public class PlainSelect extends ASTNodeAccessImpl implements SelectBody {
     private boolean useBrackets = false;
     private Wait wait;
     private boolean mySqlSqlCalcFoundRows = false;
-    private boolean sqlNoCacheFlag = false;
+    private MySqlSqlCacheFlags mySqlCacheFlag = null;
     private String forXmlPath;
     private KSQLWindow ksqlWindow = null;
     private boolean noWait = false;
@@ -361,8 +361,8 @@ public String toString() {
         if (top != null) {
             sql.append(top).append(" ");
         }
-        if (sqlNoCacheFlag) {
-            sql.append("SQL_NO_CACHE").append(" ");
+        if (mySqlCacheFlag != null) {
+            sql.append(mySqlCacheFlag.name()).append(" ");
         }
         if (mySqlSqlCalcFoundRows) {
             sql.append("SQL_CALC_FOUND_ROWS").append(" ");
@@ -544,25 +544,25 @@ public PlainSelect withMySqlSqlCalcFoundRows(boolean mySqlCalcFoundRows) {
         return this;
     }
 
-    public PlainSelect withMySqlSqlNoCache(boolean sqlNoCacheFlagSet) {
-        this.setMySqlSqlNoCache(sqlNoCacheFlagSet);
+    public PlainSelect withMySqlSqlNoCache(MySqlSqlCacheFlags mySqlCacheFlag) {
+        this.setMySqlSqlCacheFlag(mySqlCacheFlag);
         return this;
     }
 
     public void setMySqlSqlCalcFoundRows(boolean mySqlCalcFoundRows) {
         this.mySqlSqlCalcFoundRows = mySqlCalcFoundRows;
     }
 
-    public void setMySqlSqlNoCache(boolean sqlNoCacheFlagSet) {
-        this.sqlNoCacheFlag = sqlNoCacheFlagSet;
+    public void setMySqlSqlCacheFlag(MySqlSqlCacheFlags sqlCacheFlag) {
+        this.mySqlCacheFlag = sqlCacheFlag;
     }
 
     public boolean getMySqlSqlCalcFoundRows() {
         return this.mySqlSqlCalcFoundRows;
     }
 
-    public boolean getMySqlSqlNoCache() {
-        return this.sqlNoCacheFlag;
+    public MySqlSqlCacheFlags getMySqlSqlCacheFlag() {
+        return this.mySqlCacheFlag;
     }
 
     public void setNoWait(boolean noWait) {
diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java
@@ -122,8 +122,8 @@ public void visit(PlainSelect plainSelect) {
             buffer.append(top).append(" ");
         }
 
-        if (plainSelect.getMySqlSqlNoCache()) {
-            buffer.append("SQL_NO_CACHE").append(" ");
+        if (plainSelect.getMySqlSqlCacheFlag() != null) {
+            buffer.append(plainSelect.getMySqlSqlCacheFlag().name()).append(" ");
         }
 
         if (plainSelect.getMySqlSqlCalcFoundRows()) {
diff --git a/src/main/java/net/sf/jsqlparser/util/validation/feature/MariaDbVersion.java b/src/main/java/net/sf/jsqlparser/util/validation/feature/MariaDbVersion.java
@@ -138,7 +138,8 @@ public enum MariaDbVersion implements Version {
                     Feature.commit,
                     // https://mariadb.com/kb/en/optimizer-hints/
                     Feature.mySqlHintStraightJoin,
-                    Feature.mysqlCalcFoundRows, Feature.mysqlSqlNoCache)),
+                    Feature.mysqlCalcFoundRows, 
+                    Feature.mysqlSqlCacheFlag)),
 
     ORACLE_MODE("oracle_mode", V10_5_4.copy().add(Feature.selectUnique).getFeatures());
 
diff --git a/src/main/java/net/sf/jsqlparser/util/validation/feature/MySqlVersion.java b/src/main/java/net/sf/jsqlparser/util/validation/feature/MySqlVersion.java
@@ -121,7 +121,7 @@ public enum MySqlVersion implements Version {
                     Feature.commit,
                     //
                     Feature.mySqlHintStraightJoin,
-                    Feature.mysqlSqlNoCache,
+                    Feature.mysqlSqlCacheFlag,
                     Feature.mysqlCalcFoundRows));
 
     private Set<Feature> features;
diff --git a/src/main/java/net/sf/jsqlparser/util/validation/validator/SelectValidator.java b/src/main/java/net/sf/jsqlparser/util/validation/validator/SelectValidator.java
@@ -52,7 +52,7 @@
  * @author gitmotte
  */
 public class SelectValidator extends AbstractValidator<SelectItem>
-implements SelectVisitor, SelectItemVisitor, FromItemVisitor, PivotVisitor {
+        implements SelectVisitor, SelectItemVisitor, FromItemVisitor, PivotVisitor {
 
     @Override
     public void visit(PlainSelect plainSelect) {
@@ -74,7 +74,7 @@ public void visit(PlainSelect plainSelect) {
             }
 
             validateOptionalFeature(c, plainSelect.getTop(), Feature.top);
-            validateFeature(c, plainSelect.getMySqlSqlNoCache(), Feature.mysqlSqlNoCache);
+            validateFeature(c, plainSelect.getMySqlSqlCacheFlag() != null, Feature.mysqlSqlCacheFlag);
             validateFeature(c, plainSelect.getMySqlSqlCalcFoundRows(), Feature.mysqlCalcFoundRows);
             validateOptionalFeature(c, plainSelect.getIntoTables(), Feature.selectInto);
             validateOptionalFeature(c, plainSelect.getKsqlWindow(), Feature.kSqlWindow);
@@ -243,7 +243,7 @@ public void validateOptionalJoin(Join join) {
         }
 
         validateOptionalFromItem(join.getRightItem());
-        for (Expression onExpression: join.getOnExpressions()) {
+        for (Expression onExpression : join.getOnExpressions()) {
             validateOptionalExpression(onExpression);
         }
         validateOptionalExpressions(join.getUsingColumns());
@@ -331,6 +331,4 @@ public void validate(SelectItem statement) {
         statement.accept(this);
     }
 
-
-
 }
diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
@@ -404,6 +404,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |   <K_USER:"USER">
 |   <K_SQL_CALC_FOUND_ROWS: "SQL_CALC_FOUND_ROWS">
 |   <K_SQL_NO_CACHE: "SQL_NO_CACHE">
+|   <K_SQL_CACHE: "SQL_CACHE">
 |   <K_USING:"USING">
 |   <K_SIGNED:"SIGNED">
 |   <K_STRING_FUNCTION_NAME: ("SUBSTR" | "SUBSTRING" | "TRIM" | "POSITION" | "OVERLAY")>
@@ -1849,7 +1850,8 @@ PlainSelect PlainSelect() #PlainSelect:
             )
         |
             (
-                <K_SQL_NO_CACHE> { plainSelect.setMySqlSqlNoCache(true); }
+                <K_SQL_NO_CACHE> { plainSelect.setMySqlSqlCacheFlag(MySqlSqlCacheFlags.SQL_NO_CACHE); }
+                | <K_SQL_CACHE> { plainSelect.setMySqlSqlCacheFlag(MySqlSqlCacheFlags.SQL_CACHE); }
             )
         )
     ]
diff --git a/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java b/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java
@@ -2809,6 +2809,12 @@ public void testSqlNoCache() throws JSQLParserException {
         String stmt = "SELECT SQL_NO_CACHE sales.date FROM sales";
         assertSqlCanBeParsedAndDeparsed(stmt);
     }
+    
+    @Test
+    public void testSqlCache() throws JSQLParserException {
+        String stmt = "SELECT SQL_CACHE sales.date FROM sales";
+        assertSqlCanBeParsedAndDeparsed(stmt);
+    }
 
     public void testSelectInto1() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("SELECT * INTO user_copy FROM user");

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public class PlainSelect extends ASTNodeAccessImpl implements SelectBody {`
`49`	`49`	`private boolean useBrackets = false;`
`50`	`50`	`private Wait wait;`
`51`	`51`	`private boolean mySqlSqlCalcFoundRows = false;`
`52`		`- private boolean sqlNoCacheFlag = false;`
	`52`	`+ private MySqlSqlCacheFlags mySqlCacheFlag = null;`
`53`	`53`	`private String forXmlPath;`
`54`	`54`	`private KSQLWindow ksqlWindow = null;`
`55`	`55`	`private boolean noWait = false;`
`@@ -361,8 +361,8 @@ public String toString() {`
`361`	`361`	`if (top != null) {`
`362`	`362`	`sql.append(top).append(" ");`
`363`	`363`	`}`
`364`		`- if (sqlNoCacheFlag) {`
`365`		`- sql.append("SQL_NO_CACHE").append(" ");`
	`364`	`+ if (mySqlCacheFlag != null) {`
	`365`	`+ sql.append(mySqlCacheFlag.name()).append(" ");`
`366`	`366`	`}`
`367`	`367`	`if (mySqlSqlCalcFoundRows) {`
`368`	`368`	`sql.append("SQL_CALC_FOUND_ROWS").append(" ");`
`@@ -544,25 +544,25 @@ public PlainSelect withMySqlSqlCalcFoundRows(boolean mySqlCalcFoundRows) {`
`544`	`544`	`return this;`
`545`	`545`	`}`
`546`	`546`
`547`		`- public PlainSelect withMySqlSqlNoCache(boolean sqlNoCacheFlagSet) {`
`548`		`- this.setMySqlSqlNoCache(sqlNoCacheFlagSet);`
	`547`	`+ public PlainSelect withMySqlSqlNoCache(MySqlSqlCacheFlags mySqlCacheFlag) {`
	`548`	`+ this.setMySqlSqlCacheFlag(mySqlCacheFlag);`
`549`	`549`	`return this;`
`550`	`550`	`}`
`551`	`551`
`552`	`552`	`public void setMySqlSqlCalcFoundRows(boolean mySqlCalcFoundRows) {`
`553`	`553`	`this.mySqlSqlCalcFoundRows = mySqlCalcFoundRows;`
`554`	`554`	`}`
`555`	`555`
`556`		`- public void setMySqlSqlNoCache(boolean sqlNoCacheFlagSet) {`
`557`		`- this.sqlNoCacheFlag = sqlNoCacheFlagSet;`
	`556`	`+ public void setMySqlSqlCacheFlag(MySqlSqlCacheFlags sqlCacheFlag) {`
	`557`	`+ this.mySqlCacheFlag = sqlCacheFlag;`
`558`	`558`	`}`
`559`	`559`
`560`	`560`	`public boolean getMySqlSqlCalcFoundRows() {`
`561`	`561`	`return this.mySqlSqlCalcFoundRows;`
`562`	`562`	`}`
`563`	`563`
`564`		`- public boolean getMySqlSqlNoCache() {`
`565`		`- return this.sqlNoCacheFlag;`
	`564`	`+ public MySqlSqlCacheFlags getMySqlSqlCacheFlag() {`
	`565`	`+ return this.mySqlCacheFlag;`
`566`	`566`	`}`
`567`	`567`
`568`	`568`	`public void setNoWait(boolean noWait) {`
Original file line number	Diff line number	Diff line change
`@@ -122,8 +122,8 @@ public void visit(PlainSelect plainSelect) {`
`122`	`122`	`buffer.append(top).append(" ");`
`123`	`123`	`}`
`124`	`124`
`125`		`- if (plainSelect.getMySqlSqlNoCache()) {`
`126`		`- buffer.append("SQL_NO_CACHE").append(" ");`
	`125`	`+ if (plainSelect.getMySqlSqlCacheFlag() != null) {`
	`126`	`+ buffer.append(plainSelect.getMySqlSqlCacheFlag().name()).append(" ");`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`if (plainSelect.getMySqlSqlCalcFoundRows()) {`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@`
`52`	`52`	`* @author gitmotte`
`53`	`53`	`*/`
`54`	`54`	`public class SelectValidator extends AbstractValidator<SelectItem>`
`55`		`-implements SelectVisitor, SelectItemVisitor, FromItemVisitor, PivotVisitor {`
	`55`	`+ implements SelectVisitor, SelectItemVisitor, FromItemVisitor, PivotVisitor {`
`56`	`56`
`57`	`57`	`@Override`
`58`	`58`	`public void visit(PlainSelect plainSelect) {`
`@@ -74,7 +74,7 @@ public void visit(PlainSelect plainSelect) {`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`validateOptionalFeature(c, plainSelect.getTop(), Feature.top);`
`77`		`- validateFeature(c, plainSelect.getMySqlSqlNoCache(), Feature.mysqlSqlNoCache);`
	`77`	`+ validateFeature(c, plainSelect.getMySqlSqlCacheFlag() != null, Feature.mysqlSqlCacheFlag);`
`78`	`78`	`validateFeature(c, plainSelect.getMySqlSqlCalcFoundRows(), Feature.mysqlCalcFoundRows);`
`79`	`79`	`validateOptionalFeature(c, plainSelect.getIntoTables(), Feature.selectInto);`
`80`	`80`	`validateOptionalFeature(c, plainSelect.getKsqlWindow(), Feature.kSqlWindow);`
`@@ -243,7 +243,7 @@ public void validateOptionalJoin(Join join) {`
`243`	`243`	`}`
`244`	`244`
`245`	`245`	`validateOptionalFromItem(join.getRightItem());`
`246`		`- for (Expression onExpression: join.getOnExpressions()) {`
	`246`	`+ for (Expression onExpression : join.getOnExpressions()) {`
`247`	`247`	`validateOptionalExpression(onExpression);`
`248`	`248`	`}`
`249`	`249`	`validateOptionalExpressions(join.getUsingColumns());`
`@@ -331,6 +331,4 @@ public void validate(SelectItem statement) {`
`331`	`331`	`statement.accept(this);`
`332`	`332`	`}`
`333`	`333`
`334`		`-`
`335`		`-`
`336`	`334`	`}`
Original file line number	Diff line number	Diff line change
`@@ -404,6 +404,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */`
`404`	`404`	`\| <K_USER:"USER">`
`405`	`405`	`\| <K_SQL_CALC_FOUND_ROWS: "SQL_CALC_FOUND_ROWS">`
`406`	`406`	`\| <K_SQL_NO_CACHE: "SQL_NO_CACHE">`
	`407`	`+\| <K_SQL_CACHE: "SQL_CACHE">`
`407`	`408`	`\| <K_USING:"USING">`
`408`	`409`	`\| <K_SIGNED:"SIGNED">`
`409`	`410`	`\| <K_STRING_FUNCTION_NAME: ("SUBSTR" \| "SUBSTRING" \| "TRIM" \| "POSITION" \| "OVERLAY")>`
`@@ -1849,7 +1850,8 @@ PlainSelect PlainSelect() #PlainSelect:`
`1849`	`1850`	`)`
`1850`	`1851`	`\|`
`1851`	`1852`	`(`
`1852`		`- <K_SQL_NO_CACHE> { plainSelect.setMySqlSqlNoCache(true); }`
	`1853`	`+ <K_SQL_NO_CACHE> { plainSelect.setMySqlSqlCacheFlag(MySqlSqlCacheFlags.SQL_NO_CACHE); }`
	`1854`	`+ \| <K_SQL_CACHE> { plainSelect.setMySqlSqlCacheFlag(MySqlSqlCacheFlags.SQL_CACHE); }`
`1853`	`1855`	`)`
`1854`	`1856`	`)`
`1855`	`1857`	`]`