introduces sql server hints

Author: wumpz

src/main/java/net/sf/jsqlparser/expression/SQLServerHints.java

@@ -0,0 +1,38 @@
+/*-
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2019 JSQLParser
+ * %%
+ * Dual licensed under GNU LGPL 2.1 or Apache License 2.0
+ * #L%
+ */
+package net.sf.jsqlparser.expression;
+
+public class SQLServerHints {
+
+    private Boolean noLock;
+
+    public SQLServerHints() {
+    }
+
+    public SQLServerHints withNoLock() {
+        this.noLock = true;
+        return this;
+    }
+
+    public Boolean getNoLock() {
+        return noLock;
+    }
+
+    public void setNoLock(Boolean noLock) {
+        this.noLock = noLock;
+    }
+
+    @Override
+    public String toString() {
+        return " WITH("
+                + (noLock != null ? "nolock" : "")
+                + ")";
+    }
+}

src/main/java/net/sf/jsqlparser/schema/Table.java

@@ -34,7 +34,8 @@ public class Table extends ASTNodeAccessImpl implements FromItem, MultiPartName
     private Alias alias;
     private Pivot pivot;
     private UnPivot unpivot;
-    private MySQLIndexHint hint;
+    private MySQLIndexHint mysqlHints;
+    private SQLServerHints sqlServerHints;
 
     public Table() {
     }
@@ -160,11 +161,19 @@ public void setUnPivot(UnPivot unpivot) {
     }
 
     public MySQLIndexHint getIndexHint() {
-        return hint;
+        return mysqlHints;
     }
 
     public void setHint(MySQLIndexHint hint) {
-        this.hint = hint;
+        this.mysqlHints = hint;
+    }
+
+    public SQLServerHints getSqlServerHints() {
+        return sqlServerHints;
+    }
+
+    public void setSqlServerHints(SQLServerHints sqlServerHints) {
+        this.sqlServerHints = sqlServerHints;
     }
 
     @Override
@@ -173,6 +182,7 @@ public String toString() {
                 + ((alias != null) ? alias.toString() : "")
                 + ((pivot != null) ? " " + pivot : "")
                 + ((unpivot != null) ? " " + unpivot : "")
-                + ((hint != null) ? hint.toString() : "");
+                + ((mysqlHints != null) ? mysqlHints.toString() : "")
+                + ((sqlServerHints != null) ? sqlServerHints.toString() : "");
     }
 }

src/main/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java

@@ -238,6 +238,10 @@ public void visit(Table tableName) {
         if (indexHint != null) {
             buffer.append(indexHint);
         }
+        SQLServerHints sqlServerHints = tableName.getSqlServerHints();
+        if (sqlServerHints != null) {
+            buffer.append(sqlServerHints);
+        }
     }
 
     @Override

src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt

@@ -229,6 +229,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |   <K_NEXTVAL:"NEXTVAL">
 |   <K_NO:"NO">
 |   <K_NOCYCLE:"NOCYCLE">
+|   <K_NOLOCK:"NOLOCK">
 |   <K_NOT:"NOT">
 |   <K_NOVALIDATE : "NOVALIDATE">
 |   <K_NULL:"NULL">
@@ -1136,7 +1137,7 @@ String RelObjectNameWithoutValue() :
 	  | tk=<K_ZONE> | tk=<K_COLUMNS> | tk=<K_DESCRIBE> | tk=<K_FN> | tk=<K_PATH>
       | tk=<K_DATE_LITERAL> | tk=<K_NEXTVAL> | tk=<K_TRUE> | tk=<K_FALSE> | tk=<K_DUPLICATE>
       | tk=<K_READ> | tk=<K_SIZE> | tk=<K_SESSION>
-      | tk=<K_VIEW>
+      | tk=<K_VIEW> | <K_NOLOCK>
 /*      | tk=<K_PLACING> | tk=<K_BOTH> | tk=<K_LEADING> | tk=<K_TRAILING> */
       )
 
@@ -1501,6 +1502,17 @@ Alias Alias():
     { return alias; }
 }
 
+SQLServerHints SQLServerHints() : {
+    SQLServerHints hints = new SQLServerHints();
+}
+{
+    <K_WITH> "("
+        //at the moment only nolock
+        <K_NOLOCK> { hints.withNoLock(); }
+    ")"
+    { return hints; }
+}
+
 MySQLIndexHint MySQLIndexHint():
 {
 	Token actionToken = null;
@@ -1711,6 +1723,7 @@ FromItem FromItem():
     UnPivot unpivot = null;
     Alias alias = null;
     MySQLIndexHint indexHint = null;
+    SQLServerHints sqlServerHints = null;
 }
 {
     (
@@ -1746,10 +1759,17 @@ FromItem FromItem():
 			[(LOOKAHEAD(2) pivot=PivotXml()|pivot=Pivot()) { fromItem.setPivot(pivot); } ]
             [
                 LOOKAHEAD(2)
-                indexHint=MySQLIndexHint() {
-                    if (fromItem instanceof Table)
-						((Table) fromItem).setHint(indexHint);
-                }
+                (
+                    indexHint = MySQLIndexHint() {
+                        if (fromItem instanceof Table)
+                                                    ((Table) fromItem).setHint(indexHint);
+                    }
+                    |
+                    sqlServerHints = SQLServerHints() {
+                        if (fromItem instanceof Table)
+                                                    ((Table) fromItem).setSqlServerHints(sqlServerHints);
+                    }
+                )
             ]
         )
     )