fix h2 converter v0.2

apolloconfig · Feb 2, 2024 · d68ed97 · d68ed97
1 parent 06afabb
commit d68ed97
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/...r/src/main/java/com/ctrip/framework/apollo/build/sql/converter/ApolloH2ConverterUtil.java b/...r/src/main/java/com/ctrip/framework/apollo/build/sql/converter/ApolloH2ConverterUtil.java
@@ -132,7 +132,16 @@ private static String convertTableConfig(String convertedText, SqlStatement sqlS
   }
 
   private static final Pattern INDEX_NAME_PATTERN = Pattern.compile(
-      "(KEY\\s*`|KEY\\s+)(?<indexName>[a-zA-Z0-9\\-_]+)(`)?", Pattern.CASE_INSENSITIVE);
+      // KEY `AppId_ClusterName_GroupName`
+      "(KEY\\s*`|KEY\\s+)(?<indexName>[a-zA-Z0-9\\-_]+)(`)?\\s*"
+          // (`AppId`,`ClusterName`(191),`NamespaceName`(191))
+          + "\\((?<indexColumns>"
+          + "(`)?[a-zA-Z0-9\\-_]+(`)?\\s*(\\([0-9]+\\))?"
+          + "(,"
+          + "(`)?[a-zA-Z0-9\\-_]+(`)?\\s*(\\([0-9]+\\))?"
+          + ")*"
+          + ")\\)",
+      Pattern.CASE_INSENSITIVE);
 
   private static String convertIndexWithTable(String convertedText, String tableName,
       SqlStatement sqlStatement) {
@@ -147,7 +156,8 @@ private static String convertIndexWithTable(String convertedText, String tableNa
         // KEY `tableName_AppId_ClusterName_GroupName` (`AppId`,`ClusterName`(191),`NamespaceName`(191))
         Matcher indexNameMatcher = INDEX_NAME_PATTERN.matcher(convertedLine);
         if (indexNameMatcher.find()) {
-          convertedLine = indexNameMatcher.replaceAll("KEY `" + tableName + "_${indexName}`");
+          convertedLine = indexNameMatcher.replaceAll(
+              "KEY `" + tableName + "_${indexName}` (${indexColumns})");
         }
         convertedLine = removePrefixIndex(convertedLine);
       }
@@ -203,7 +213,8 @@ private static String convertAlterTable(String convertedText, SqlStatement sqlSt
       "\\s*ADD\\s+(?<indexType>(UNIQUE\\s+)?INDEX)\\s+(`)?(?<indexName>[a-zA-Z0-9\\-_]+)(`)?(?<subStatement>.*)[,;]",
       Pattern.CASE_INSENSITIVE);
   private static final Pattern DROP_INDEX_PATTERN = Pattern.compile(
-      "\\s*DROP\\s+INDEX\\s+(`)?(?<indexName>[a-zA-Z0-9\\-_]+)(`)?\\s*[,;]", Pattern.CASE_INSENSITIVE);
+      "\\s*DROP\\s+INDEX\\s+(`)?(?<indexName>[a-zA-Z0-9\\-_]+)(`)?\\s*[,;]",
+      Pattern.CASE_INSENSITIVE);
 
   private static String convertAlterTableMulti(String convertedText, SqlStatement sqlStatement,
       String tableName) {