fix structure compare

Author: PeachThinking

server/odc-common/pom.xml

@@ -171,5 +171,9 @@
             <groupId>com.auth0</groupId>
             <artifactId>java-jwt</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.oceanbase</groupId>
+            <artifactId>db-browser</artifactId>
+        </dependency>
     </dependencies>
 </project>

server/odc-common/src/main/java/com/oceanbase/odc/common/util/StringUtils.java

@@ -18,15 +18,20 @@
 import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 import java.util.UUID;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.apache.commons.text.StringSubstitutor;
+import org.springframework.util.CollectionUtils;
 
 import com.google.common.primitives.Chars;
+import com.oceanbase.tools.dbbrowser.model.DBTable;
+import com.oceanbase.tools.dbbrowser.model.DBTableColumn;
+import com.oceanbase.tools.dbbrowser.model.datatype.DataTypeUtil;
 
 import lombok.NonNull;
 
@@ -163,6 +168,31 @@ public static String unquoteSqlValue(final String str, final char wrapChar, fina
         return unescapeUseDouble(unwrap, escapeChars);
     }
 
+    public static void quoteColumnDefaultValues(DBTable table) {
+        if (!CollectionUtils.isEmpty(table.getColumns())) {
+            table.getColumns().forEach(column -> {
+                String defaultValue = column.getDefaultValue();
+                if (StringUtils.isNotEmpty(defaultValue)) {
+                    if (!isDefaultValueBuiltInFunction(column)) {
+                        column.setDefaultValue("'".concat(defaultValue.replace("'", "''")).concat("'"));
+                    }
+                }
+            });
+        }
+    }
+
+    /**
+     * Check whether the data_default contain built in function. Any of the synonyms for
+     * CURRENT_TIMESTAMP have the same meaning as CURRENT_TIMESTAMP. These are CURRENT_TIMESTAMP(),
+     * NOW(), LOCALTIME, LOCALTIME(), LOCALTIMESTAMP, and LOCALTIMESTAMP().
+     */
+    private static boolean isDefaultValueBuiltInFunction(DBTableColumn column) {
+        return com.oceanbase.tools.dbbrowser.util.StringUtils.isEmpty(column.getDefaultValue())
+                || (!DataTypeUtil.isStringType(column.getTypeName())
+                        && column.getDefaultValue().trim().toUpperCase(Locale.getDefault())
+                                .startsWith("CURRENT_TIMESTAMP"));
+    }
+
     public static String singleLine(final String str) {
         if (StringUtils.isEmpty(str)) {
             return str;

server/odc-service/src/main/java/com/oceanbase/odc/service/shadowtable/ShadowTableComparingTask.java

@@ -17,7 +17,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.Callable;
@@ -45,8 +44,6 @@
 import com.oceanbase.tools.dbbrowser.editor.DBTableEditor;
 import com.oceanbase.tools.dbbrowser.model.DBConstraintType;
 import com.oceanbase.tools.dbbrowser.model.DBTable;
-import com.oceanbase.tools.dbbrowser.model.DBTableColumn;
-import com.oceanbase.tools.dbbrowser.model.datatype.DataTypeUtil;
 
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
@@ -108,7 +105,7 @@ public Void call() {
                                 .filter(entry -> allRealTableNames.contains(entry.getKey()))
                                 .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
                 if (connectionSession.getDialectType().isMysql()) {
-                    tableName2Tables.values().stream().forEach(table -> quoteColumnDefaultValues(table));
+                    tableName2Tables.values().forEach(StringUtils::quoteColumnDefaultValues);
                 }
 
             } catch (Exception ex) {
@@ -216,29 +213,4 @@ public GenerateTableDDLResp generateUpdateDDLWithoutRenaming(@NotNull Connection
                 .previousIdentity(TableIdentity.of(req.getPrevious().getSchemaName(), req.getPrevious().getName()))
                 .build();
     }
-
-    private void quoteColumnDefaultValues(DBTable table) {
-        if (!CollectionUtils.isEmpty(table.getColumns())) {
-            table.getColumns().forEach(column -> {
-                String defaultValue = column.getDefaultValue();
-                if (StringUtils.isNotEmpty(defaultValue)) {
-                    if (!isDefaultValueBuiltInFunction(column)) {
-                        column.setDefaultValue("'".concat(defaultValue.replace("'", "''")).concat("'"));
-                    }
-                }
-            });
-        }
-    }
-
-    /**
-     * Check whether the data_default contain built in function. Any of the synonyms for
-     * CURRENT_TIMESTAMP have the same meaning as CURRENT_TIMESTAMP. These are CURRENT_TIMESTAMP(),
-     * NOW(), LOCALTIME, LOCALTIME(), LOCALTIMESTAMP, and LOCALTIMESTAMP().
-     */
-    private boolean isDefaultValueBuiltInFunction(DBTableColumn column) {
-        return com.oceanbase.tools.dbbrowser.util.StringUtils.isEmpty(column.getDefaultValue())
-                || (!DataTypeUtil.isStringType(column.getTypeName())
-                        && column.getDefaultValue().trim().toUpperCase(Locale.getDefault())
-                                .startsWith("CURRENT_TIMESTAMP"));
-    }
 }

server/odc-service/src/main/java/com/oceanbase/odc/service/structurecompare/DefaultDBStructureComparator.java

@@ -25,6 +25,7 @@
 import javax.sql.DataSource;
 
 import com.oceanbase.odc.common.util.JdbcOperationsUtil;
+import com.oceanbase.odc.common.util.StringUtils;
 import com.oceanbase.odc.core.shared.constant.ConnectType;
 import com.oceanbase.odc.core.shared.constant.DialectType;
 import com.oceanbase.odc.service.db.browser.DBSchemaAccessors;
@@ -87,6 +88,11 @@ public List<DBObjectComparisonResult> compare(@NonNull DBStructureComparisonConf
         long startTimestamp = System.currentTimeMillis();
         Map<String, DBTable> srcTableName2Table = srcAccessor.getTables(srcConfig.getSchemaName(), null);
         Map<String, DBTable> tgtTableName2Table = tgtAccessor.getTables(tgtConfig.getSchemaName(), null);
+
+        if (srcConfig.getConnectType().getDialectType().isMysql()) {
+            srcTableName2Table.values().forEach(StringUtils::quoteColumnDefaultValues);
+            tgtTableName2Table.values().forEach(StringUtils::quoteColumnDefaultValues);
+        }
         log.info(
                 "DefaultDBStructureComparator build source and target schema tables success, time consuming={} seconds",
                 (System.currentTimeMillis() - startTimestamp) / 1000);