fixed: duplicate foreign key issue (#188)

AdaptiveScale · Jul 6, 2023 · 1de0075 · 1de0075
1 parent 3467818
commit 1de0075
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 6 deletions.
diff --git a/common/src/main/java/com/adaptivescale/rosetta/common/models/ForeignKey.java b/common/src/main/java/com/adaptivescale/rosetta/common/models/ForeignKey.java
@@ -1,5 +1,7 @@
 package com.adaptivescale.rosetta.common.models;
 
+import java.util.Objects;
+
 public class ForeignKey {
     private String name;
     private String schema;
@@ -74,4 +76,17 @@ public String getColumnName() {
     public void setColumnName(String columnName) {
         this.columnName = columnName;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        ForeignKey that = (ForeignKey) o;
+        return Objects.equals(name, that.name) && Objects.equals(tableName, that.tableName) && Objects.equals(columnName, that.columnName);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(name, tableName, columnName);
+    }
 }
diff --git a/...main/java/com/adataptivescale/rosetta/source/core/extractors/column/ColumnsExtractor.java b/...main/java/com/adataptivescale/rosetta/source/core/extractors/column/ColumnsExtractor.java
@@ -26,6 +26,7 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.*;
+import java.util.stream.Collectors;
 
 public class ColumnsExtractor implements ColumnExtractor<java.sql.Connection, Collection<Table>> {
 
@@ -79,7 +80,7 @@ protected void extract(ResultSet resultSet, Column column) throws SQLException {
 
     private Map<String, List<ForeignKey>> extractForeignKeys(java.sql.Connection connection, Table table) throws SQLException {
         ResultSet exportedKeys = connection.getMetaData().getImportedKeys(this.connection.getDatabaseName(), table.getSchema(), table.getName());
-        Map<String, List<ForeignKey>> result = new HashMap<>();
+        Map<String, Set<ForeignKey>> result = new HashMap<>();
 
         while (exportedKeys.next()) {
             ForeignKey foreignKey = new ForeignKey();
@@ -101,11 +102,16 @@ private Map<String, List<ForeignKey>> extractForeignKeys(java.sql.Connection con
             foreignKey.setPrimaryTableName(exportedKeys.getString("PKTABLE_NAME"));
             foreignKey.setPrimaryColumnName(exportedKeys.getString("PKCOLUMN_NAME"));
 
-            List<ForeignKey> foreignKeys = result.computeIfAbsent(foreignKey.getColumnName(), k -> new ArrayList<>());
+            Set<ForeignKey> foreignKeys = result.computeIfAbsent(foreignKey.getColumnName(), k -> new HashSet<>());
             foreignKeys.add(foreignKey);
         }
 
-        return result;
+        return result.entrySet()
+            .stream()
+            .collect(Collectors.toMap(
+                    Map.Entry::getKey,
+                    entry -> new ArrayList<>(entry.getValue())
+            ));
     }
 
     private Map<String, Integer> extractPrimaryKeys(java.sql.Connection connection, Table table) throws SQLException {

diff --git a/...n/java/com/adataptivescale/rosetta/source/core/extractors/column/DB2ColumnsExtractor.java b/...n/java/com/adataptivescale/rosetta/source/core/extractors/column/DB2ColumnsExtractor.java
@@ -11,6 +11,7 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.*;
+import java.util.stream.Collectors;
 
 @RosettaModule(
         name = "db2",
@@ -61,7 +62,7 @@ protected void extract(ResultSet resultSet, Column column) throws SQLException {
 
     private Map<String, List<ForeignKey>> extractForeignKeys(java.sql.Connection connection, Table table) throws SQLException {
         ResultSet exportedKeys = connection.getMetaData().getImportedKeys(null, table.getSchema(), table.getName());
-        Map<String, List<ForeignKey>> result = new HashMap<>();
+        Map<String, Set<ForeignKey>> result = new HashMap<>();
 
         while (exportedKeys.next()) {
             ForeignKey foreignKey = new ForeignKey();
@@ -83,11 +84,16 @@ private Map<String, List<ForeignKey>> extractForeignKeys(java.sql.Connection con
             foreignKey.setPrimaryTableName(exportedKeys.getString("PKTABLE_NAME"));
             foreignKey.setPrimaryColumnName(exportedKeys.getString("PKCOLUMN_NAME"));
 
-            List<ForeignKey> foreignKeys = result.computeIfAbsent(foreignKey.getColumnName(), k -> new ArrayList<>());
+            Set<ForeignKey> foreignKeys = result.computeIfAbsent(foreignKey.getColumnName(), k -> new HashSet<>());
             foreignKeys.add(foreignKey);
         }
 
-        return result;
+        return result.entrySet()
+            .stream()
+            .collect(Collectors.toMap(
+                    Map.Entry::getKey,
+                    entry -> new ArrayList<>(entry.getValue())
+            ));
     }
 
     private Map<String, Integer> extractPrimaryKeys(java.sql.Connection connection, Table table) throws SQLException {