fix: table diff is none when index or fk is modified

vran-dev · Dec 1, 2023 · 633026a · 633026a
1 parent bb2e5a7
commit 633026a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/core/src/main/java/com/databasir/core/domain/document/diff/DocumentDiffChecker.java b/core/src/main/java/com/databasir/core/domain/document/diff/DocumentDiffChecker.java
@@ -109,10 +109,21 @@ public List<TableDocDiff> diff(List<TableDocDiff> original, List<TableDocDiff> c
 
                     BaseTypeFieldEqualFunction eq = new BaseTypeFieldEqualFunction(IGNORE_FIELDS);
                     DiffType diffType = eq.apply(currentTable, originalTable) ? DiffType.NONE : DiffType.MODIFIED;
+                    boolean indexModified = indexDiffs.stream()
+                            .anyMatch(indexDiff -> indexDiff.getDiffType() != DiffType.NONE);
+                    boolean triggerModified = triggerDiffs.stream()
+                            .anyMatch(triggerDiff -> triggerDiff.getDiffType() != DiffType.NONE);
+                    boolean fkModified = fkDiffs.stream()
+                            .anyMatch(fkDiff -> fkDiff.getDiffType() != DiffType.NONE);
+                    if (indexModified || triggerModified || fkModified) {
+                        diffType = DiffType.MODIFIED;
+                    }
+
                     // workaround for diffType = NONE
                     if (diffType == DiffType.NONE) {
                         originalTable = null;
                     }
+
                     return TableDocDiff.builder()
                             .id(currentTable.getId())
                             .diffType(diffType)

diff --git a/meta/src/main/java/com/databasir/core/meta/provider/MetaProviders.java b/meta/src/main/java/com/databasir/core/meta/provider/MetaProviders.java
@@ -13,6 +13,7 @@
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.SQLException;
+import java.util.PriorityQueue;
 
 @Slf4j
 public class MetaProviders {
@@ -73,6 +74,7 @@ private static DatabaseMetaProvider mysql() {
     }
 
     private static DatabaseMetaProvider sqlServer() {
+        SqlServerColumnMetaProvider var = new SqlServerColumnMetaProvider();
         var columnMetaProvider = new SqlServerColumnMetaProvider();
         var foreignKeyMetaProvider = new JdbcForeignKeyMetaProvider();
         var indexMetaProvider = new JdbcIndexMetaProvider();
@@ -87,6 +89,9 @@ private static DatabaseMetaProvider sqlServer() {
     }
 
     private static DatabaseMetaProvider postgresql() {
+        var queue = new PriorityQueue<Integer>();
+        queue.offer(1);
+
         var columnMetaProvider = new JdbcColumnMetaProvider();
         var foreignKeyMetaProvider = new JdbcForeignKeyMetaProvider();
         var indexMetaProvider = new JdbcIndexMetaProvider();