Parse all parameters of an index

src/main/java/net/sf/jsqlparser/statement/create/table/Index.java

@@ -21,6 +21,8 @@
  */
 package net.sf.jsqlparser.statement.create.table;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import net.sf.jsqlparser.statement.select.PlainSelect;
@@ -30,7 +32,7 @@
  */
 public class Index {
 
-    private String type;
+    private List<String> types;
     private List<String> columnsNames;
     private String name;
     private List<String> idxSpec;
@@ -50,7 +52,14 @@ public String getName() {
      * The type of this index: "PRIMARY KEY", "UNIQUE", "INDEX"
      */
     public String getType() {
-        return type;
+        return types == null || types.isEmpty() ? null : PlainSelect.getStringList(types, false, false);
+    }
+
+    /**
+     * All types of this index: "PRIMARY KEY", "UNIQUE", "UNIQUE NULL_FILTERED", "INDEX"
+     */
+    public List<String> getTypes() {
+        return types;
     }
 
     public void setColumnsNames(List<String> list) {
@@ -60,9 +69,20 @@ public void setColumnsNames(List<String> list) {
     public void setName(String string) {
         name = string;
     }
-
+    
     public void setType(String string) {
-        type = string;
+        if(types == null) {
+            types = new ArrayList<>();
+        }
+        if(string == null) {
+            types.clear();
+        } else {
+            types.addAll(Arrays.asList(string.split("\\s+")));
+        }
+    }
+
+    public void setTypes(List<String> list) {
+        types = list;
     }
 
     public List<String> getIndexSpec() {
@@ -76,7 +96,7 @@ public void setIndexSpec(List<String> idxSpec) {
     @Override
     public String toString() {
         String idxSpecText = PlainSelect.getStringList(idxSpec, false, false);
-        return type + (name != null ? " " + name : "") + " " + PlainSelect.
+        return (types == null || types.isEmpty() ? "" : PlainSelect.getStringList(types, false, false)) + (name != null ? " " + name : "") + " " + PlainSelect.
                 getStringList(columnsNames, true, true) + (!"".equals(idxSpecText) ? " " + idxSpecText : "");
     }
 }

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

@@ -2966,16 +2966,19 @@ CreateIndex CreateIndex():
     Index index = null;
     String name = null;
     List<String> parameter = new ArrayList<String>();
+    List<String> types = new ArrayList<String>();
+    List<String> indexSpecs = new ArrayList<String>();
+    Token ascDesc = null;
 }
 {
     <K_CREATE>
-    ( parameter=CreateParameter() )*
+    (parameter = CreateParameter() { types.addAll(parameter); })*
 
     <K_INDEX> name=RelObjectName()
     {
         index = new Index();
         index.setName(name);
-        index.setType(parameter.isEmpty()?null:parameter.get(0));
+        index.setTypes(types);
     }
 
     <K_ON> table=Table()
@@ -2985,9 +2988,10 @@ CreateIndex CreateIndex():
     |
     columnName=<S_QUOTED_IDENTIFIER>)
 
-    (CreateParameter() | <K_ASC> | <K_DESC>)*
+    (CreateParameter() | ascDesc=<K_ASC> | ascDesc=<K_DESC>)*
     {
         colNames.add(columnName.image);
+        indexSpecs.add(ascDesc == null ? null : ascDesc.image);
     }
 
     (
@@ -2996,9 +3000,10 @@ CreateIndex CreateIndex():
         |
         columnName=<S_QUOTED_IDENTIFIER>)
 
-        (CreateParameter() | <K_ASC> | <K_DESC>)*
+        (CreateParameter() | ascDesc=<K_ASC> | ascDesc=<K_DESC>)*
         {
             colNames.add(columnName.image);
+        indexSpecs.add(ascDesc == null ? null : ascDesc.image);
         }
     )*
 
@@ -3007,6 +3012,7 @@ CreateIndex CreateIndex():
 
     {
         index.setColumnsNames(colNames);
+        index.setIndexSpec(indexSpecs);
         createIndex.setIndex(index);
         createIndex.setTable(table);
         return createIndex;

src/test/java/net/sf/jsqlparser/statement/create/CreateIndexTest.java

@@ -84,4 +84,27 @@ public void testCreateIndex6() throws JSQLParserException {
         String stmt = "CREATE INDEX myindex ON mytab (mycol, mycol2)";
         assertSqlCanBeParsedAndDeparsed(stmt);
     }
+
+    @Test
+    public void testCreateIndexDesc() throws JSQLParserException {
+        String statement = "CREATE INDEX myindex ON mytab (mycol desc, mycol2 asc)";
+        CreateIndex createIndex = (CreateIndex) parserManager.parse(new StringReader(statement));
+        assertEquals(2, createIndex.getIndex().getColumnsNames().size());
+        assertEquals(2, createIndex.getIndex().getIndexSpec().size());
+        assertEquals("desc", createIndex.getIndex().getIndexSpec().get(0));
+        assertEquals("asc", createIndex.getIndex().getIndexSpec().get(1));
+    }
+
+    @Test
+    public void testCreateUniqueNullFilteredIndex() throws JSQLParserException {
+        String statement = "CREATE UNIQUE NULL_FILTERED INDEX myindex ON mytab (mycol)";
+        CreateIndex createIndex = (CreateIndex) parserManager.parse(new StringReader(statement));
+        assertEquals(1, createIndex.getIndex().getColumnsNames().size());
+        assertEquals(1, createIndex.getIndex().getIndexSpec().size());
+        assertEquals(2, createIndex.getIndex().getTypes().size());
+        assertEquals("UNIQUE", createIndex.getIndex().getTypes().get(0));
+        assertEquals("NULL_FILTERED", createIndex.getIndex().getTypes().get(1));
+        assertEquals("UNIQUE NULL_FILTERED", createIndex.getIndex().getType());
+        assertEquals("CREATE UNIQUE NULL_FILTERED INDEX myindex ON mytab (mycol)", createIndex.toString());
+    }
 }