Merge pull request #37 from s-sathish/master

Support KEY without a name in create table syntax

Author: neoremind

innodb-java-reader/src/main/java/com/alibaba/innodb/java/reader/schema/TableDefUtil.java

@@ -16,8 +16,10 @@
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 import lombok.extern.slf4j.Slf4j;
@@ -98,6 +100,7 @@ private static void handleCollation(CreateTable stmt, TableDef tableDef) {
   private static void handleIndex(CreateTable stmt, TableDef tableDef) {
     List<Index> indices = stmt.getIndexes();
     if (CollectionUtils.isNotEmpty(indices)) {
+      Map<String, Integer> indexesSoFar = new HashMap<>();
       for (Index index : indices) {
         if (KeyMeta.Type.isValid(index.getType())) {
           List<String> colNames = getColumnNames(index);
@@ -106,8 +109,15 @@ private static void handleIndex(CreateTable stmt, TableDef tableDef) {
             tableDef.setPrimaryKeyColumns(colNames);
           } else if (KeyMeta.Type.isValidSk(index.getType())) {
             // handle sk
+            String indexName = index.getName() == null ? colNames.get(0) : index.getName();
+            if (indexesSoFar.containsKey(indexName)) {
+              indexesSoFar.put(indexName, indexesSoFar.get(indexName) + 1);
+              indexName = indexName + '_' + indexesSoFar.get(indexName);
+            } else {
+              indexesSoFar.put(indexName, 1);
+            }
             tableDef.addSecondaryKeyColumns(index.getType().toUpperCase(),
-                index.getName(), colNames);
+                indexName, colNames);
           } else {
             // handle fulltext and foreign key
             tableDef.addSecondaryKeyColumns(index.getType().toUpperCase(),

innodb-java-reader/src/test/java/com/alibaba/innodb/java/reader/schema/TableDefUtilTest.java

@@ -618,4 +618,28 @@ public void testMakeUniqueKeyAsPrimaryKey() {
     assertThat(tableDef.getSecondaryKeyMetaMap().size(), is(0));
   }
 
+  @Test
+  public void testKeyWithoutName() {
+    String sql = "CREATE TABLE `key_without_name` (\n"
+        + "  `keyWithoutName1` VARCHAR(16) NOT NULL,\n"
+        + "  `keyWithoutName2` VARCHAR(16) NOT NULL,\n"
+        + "  `keyWithoutName3` VARCHAR(16) NOT NULL,\n"
+        + "  `keyWithoutName4` VARCHAR(16) NOT NULL,\n"
+        + "  `keyWithoutName5` VARCHAR(16) NOT NULL,\n"
+        + "  UNIQUE KEY (`keyWithoutName1`),\n"
+        + "  UNIQUE KEY (`keyWithoutName1`, `keyWithoutName2`),\n"
+        + "  UNIQUE KEY (`keyWithoutName1`, `keyWithoutName2`, `keyWithoutName3`),\n"
+        + "  UNIQUE KEY (`keyWithoutName4`),\n"
+        + "  UNIQUE KEY `namedKey` (`keyWithoutName5`)\n"
+        + ") ENGINE=InnoDB DEFAULT CHARSET=utf8";
+    TableDef tableDef = TableDefUtil.covertToTableDef(sql);
+    System.out.println(tableDef);
+
+    assertThat(tableDef.getSecondaryKeyMetaList().get(0).getName(), is("keyWithoutName1"));
+    assertThat(tableDef.getSecondaryKeyMetaList().get(1).getName(), is("keyWithoutName1_2"));
+    assertThat(tableDef.getSecondaryKeyMetaList().get(2).getName(), is("keyWithoutName1_3"));
+    assertThat(tableDef.getSecondaryKeyMetaList().get(3).getName(), is("keyWithoutName4"));
+    assertThat(tableDef.getSecondaryKeyMetaList().get(4).getName(), is("namedKey"));
+  }
+
 }