fixes #915

Author: wumpz

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

@@ -9,9 +9,13 @@
  */
 package net.sf.jsqlparser.expression;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class SQLServerHints {
 
     private Boolean noLock;
+    private String indexName;
 
     public SQLServerHints() {
     }
@@ -29,10 +33,25 @@ public void setNoLock(Boolean noLock) {
         this.noLock = noLock;
     }
 
+    public String getIndexName() {
+        return indexName;
+    }
+
+    public void setIndexName(String indexName) {
+        this.indexName = indexName;
+    }
+
     @Override
     public String toString() {
-        return " WITH("
-                + (noLock != null ? "nolock" : "")
+        List<String> hints = new ArrayList<>();
+        if (indexName != null) {
+            hints.add("INDEX (" + indexName + ")");
+        }
+        if (Boolean.TRUE.equals(noLock)) {
+            hints.add("NOLOCK");
+        }
+        return " WITH ("
+                + String.join(", ", hints)
                 + ")";
     }
 }

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

@@ -1502,13 +1502,21 @@ Alias Alias():
     { return alias; }
 }
 
+void SQLServerHint(SQLServerHints hints) : {
+    String str;
+}
+{
+        <K_INDEX> "(" str = RelObjectName() ")" { hints.setIndexName(str); }
+        |
+        <K_NOLOCK> { hints.withNoLock(); }
+}
+
 SQLServerHints SQLServerHints() : {
     SQLServerHints hints = new SQLServerHints();
 }
 {
     <K_WITH> "("
-        //at the moment only nolock
-        <K_NOLOCK> { hints.withNoLock(); }
+        SQLServerHint(hints) ("," SQLServerHint(hints) )*
     ")"
     { return hints; }
 }

src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java

@@ -3215,7 +3215,17 @@ public void testMysqlMultipleIndexHints() throws JSQLParserException {
 
     @Test
     public void testSqlServerHints() throws JSQLParserException {
-        assertSqlCanBeParsedAndDeparsed("SELECT * FROM TB_Sys_Pedido WITH(nolock) WHERE ID_Pedido = :ID_Pedido");
+        assertSqlCanBeParsedAndDeparsed("SELECT * FROM TB_Sys_Pedido WITH (NOLOCK) WHERE ID_Pedido = :ID_Pedido");
+    }
+    
+    @Test
+    public void testSqlServerHintsWithIndexIssue915() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT 1 FROM tableName1 WITH (INDEX (idx1), NOLOCK)");
+    }
+    
+    @Test
+    public void testSqlServerHintsWithIndexIssue915_2() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT 1 FROM tableName1 AS t1 WITH (INDEX (idx1)) JOIN tableName2 AS t2 WITH (INDEX (idx2)) ON t1.id = t2.id");
     }
 
     @Test