fix(structure-comparison): syntax error when executing structure comparison (#2638)

yhilmare · web-flow · commit 84157a5de2a5 · 2024-06-05T11:08:12.000+08:00
* syntax error when generating parti

* fix unit test error

* add defs for hash and key parti

* adapt for hash parti

* update submodule
diff --git a/client b/client
@@ -1 +1 @@
-Subproject commit 0786e6d701a37c6a698f1a3720760771535669ed
+Subproject commit ef800f681bb258cd7f17f21fc078adc213beb5e1
diff --git a/libs/db-browser/src/main/java/com/oceanbase/tools/dbbrowser/editor/DBTablePartitionEditor.java b/libs/db-browser/src/main/java/com/oceanbase/tools/dbbrowser/editor/DBTablePartitionEditor.java
@@ -76,11 +76,11 @@ public String generateCreateDefinitionDDL(@NotNull DBTablePartition partition) {
         if (Objects.nonNull(partition.getSubpartitionTemplated()) && partition.getSubpartitionTemplated()) {
             generateCreateTemplateSubPartition(partition, sqlBuilder);
         }
-        if (Objects.nonNull(partition.getPartitionOption().getPartitionsNum())) {
-            sqlBuilder.append("\nPARTITIONS ")
-                    .append(String.valueOf(partition.getPartitionOption().getPartitionsNum()));
-            if (partition.getPartitionOption().getType() == DBTablePartitionType.HASH
-                    || partition.getPartitionOption().getType() == DBTablePartitionType.KEY) {
+        if (partition.getPartitionOption().getType() == DBTablePartitionType.HASH
+                || partition.getPartitionOption().getType() == DBTablePartitionType.KEY) {
+            if (Objects.nonNull(partition.getPartitionOption().getPartitionsNum())) {
+                sqlBuilder.append("\nPARTITIONS ")
+                        .append(String.valueOf(partition.getPartitionOption().getPartitionsNum()));
                 return sqlBuilder.toString();
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -76,11 +76,11 @@ public String generateCreateDefinitionDDL(@NotNull DBTablePartition partition) {`
`76`	`76`	`if (Objects.nonNull(partition.getSubpartitionTemplated()) && partition.getSubpartitionTemplated()) {`
`77`	`77`	`generateCreateTemplateSubPartition(partition, sqlBuilder);`
`78`	`78`	`}`
`79`		`- if (Objects.nonNull(partition.getPartitionOption().getPartitionsNum())) {`
`80`		`- sqlBuilder.append("\nPARTITIONS ")`
`81`		`- .append(String.valueOf(partition.getPartitionOption().getPartitionsNum()));`
`82`		`- if (partition.getPartitionOption().getType() == DBTablePartitionType.HASH`
`83`		`- \|\| partition.getPartitionOption().getType() == DBTablePartitionType.KEY) {`
	`79`	`+ if (partition.getPartitionOption().getType() == DBTablePartitionType.HASH`
	`80`	`+ \|\| partition.getPartitionOption().getType() == DBTablePartitionType.KEY) {`
	`81`	`+ if (Objects.nonNull(partition.getPartitionOption().getPartitionsNum())) {`
	`82`	`+ sqlBuilder.append("\nPARTITIONS ")`
	`83`	`+ .append(String.valueOf(partition.getPartitionOption().getPartitionsNum()));`
`84`	`84`	`return sqlBuilder.toString();`
`85`	`85`	`}`
`86`	`86`	`}`